Commit be7e9635 authored by 罗超's avatar 罗超

2

parent d291084e
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<template> <template>
<div> <div>
<div class="q-mb-sm text-accent"> <div class="q-mb-sm text-accent">
<span class="text-primary">班级:</span>{{ saveObj.ClassName }} <span class="text-primary" v-if="mode === 1">班级:</span>
<span v-if="mode === 1">{{ saveObj.ClassName }}</span>
<span class="q-ml-md text-primary">课程:</span>{{ saveObj.CourseName }} <span class="q-ml-md text-primary">课程:</span>{{ saveObj.CourseName }}
</div> </div>
<div class="row q-mb-md"> <div class="row q-mb-md">
...@@ -10,11 +11,11 @@ ...@@ -10,11 +11,11 @@
<div v-for="(item, index) in stuData.StuList"> <div v-for="(item, index) in stuData.StuList">
<q-chip icon="person" class="primary" <q-chip icon="person" class="primary"
>{{ item.StuName }} >{{ item.StuName }}
<span v-if="item.IsRenewGuest == 1">(续费)</span> <span v-if="item.IsRenewGuest === 1">(续费)</span>
</q-chip> </q-chip>
</div> </div>
</div> </div>
<div class="col-2"> <div class="col-2" v-if="mode == 1">
<q-toggle <q-toggle
v-model="OrderMsg.IsChaBan" v-model="OrderMsg.IsChaBan"
:true-value="1" :true-value="1"
...@@ -200,7 +201,18 @@ ...@@ -200,7 +201,18 @@
class="col-6 q-py-sm" class="col-6 q-py-sm"
label="应收" label="应收"
/> />
<q-select
v-if="mode == 2"
standout="bg-primary text-white"
option-value="SId"
option-label="SName"
v-model="OrderMsg.ScrollSchoolId"
:options="newSchoolList"
emit-value
map-options
class="col-6 q-py-sm"
label="校区"
/>
<q-select <q-select
:disable="modityOrderType == 2" :disable="modityOrderType == 2"
standout="bg-primary text-white" standout="bg-primary text-white"
...@@ -338,16 +350,21 @@ ...@@ -338,16 +350,21 @@
</q-card-section> </q-card-section>
<q-card-section class="q-pt-none"> <q-card-section class="q-pt-none">
{{inceptionData.Message}} {{ inceptionData.Message }}
</q-card-section> </q-card-section>
<q-card-actions align="right" class="text-primary"> <q-card-actions align="right" class="text-primary">
<q-btn flat label="取消" size="sm" v-close-popup /> <q-btn flat label="取消" size="sm" v-close-popup />
<q-btn label="立即查看" size="sm" color="accent q-px-md" style="font-weight:400 !important" @click="goorder" /> <q-btn
label="立即查看"
size="sm"
color="accent q-px-md"
style="font-weight:400 !important"
@click="goorder"
/>
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -366,6 +383,10 @@ export default { ...@@ -366,6 +383,10 @@ export default {
type: Object, type: Object,
default: null default: null
}, },
mode: {
type: Number, //1:约课,2:班课
default: 1
},
//订单类型 //订单类型
orderType: { orderType: {
type: Number, type: Number,
...@@ -380,6 +401,10 @@ export default { ...@@ -380,6 +401,10 @@ export default {
//学生是否续费 //学生是否续费
type: Object, type: Object,
default: null default: null
},
schoolList: {
type: Array,
default: () => []
} }
}, },
data() { data() {
...@@ -419,10 +444,12 @@ export default { ...@@ -419,10 +444,12 @@ export default {
CustomerId: 0, //同行 CustomerId: 0, //同行
OrderIdentify: 2, //标识参数, 1产品下单 2客户转订单 OrderIdentify: 2, //标识参数, 1产品下单 2客户转订单
StuIds: "", StuIds: "",
EnterId: 0 //市场人员 EnterId: 0, //市场人员
// NormalCommission:'',//正常返佣金额 // NormalCommission:'',//正常返佣金额
// RenewCommission:"",// 预计返佣金额 // RenewCommission:"",// 预计返佣金额
ScrollSchoolId: -1
}, },
newSchoolList: [],
EnterName: "", //市场人员 EnterName: "", //市场人员
Unit_PriceRemark: "", //单价规则 Unit_PriceRemark: "", //单价规则
IsShowUpPrice: false, //是否显示高于定价 IsShowUpPrice: false, //是否显示高于定价
...@@ -437,8 +464,8 @@ export default { ...@@ -437,8 +464,8 @@ export default {
beforeOrderList: [], //前置订单数据 beforeOrderList: [], //前置订单数据
HelpEnterDisable: false, //是否可选择协助教师 HelpEnterDisable: false, //是否可选择协助教师
CourseConsultantDisable: false, //是否可选择课程顾问 CourseConsultantDisable: false, //是否可选择课程顾问
inception:false, inception: false,
inceptionData:null, inceptionData: null
}; };
}, },
created() { created() {
...@@ -452,6 +479,12 @@ export default { ...@@ -452,6 +479,12 @@ export default {
this.getSelectClass(); this.getSelectClass();
}, },
mounted() { mounted() {
this.newSchoolList = [];
this.newSchoolList = JSON.parse(JSON.stringify(this.schoolList));
this.newSchoolList.unshift({
SName: "不限",
SId: -1
});
this.initData(); this.initData();
this.getAssistList(); this.getAssistList();
this.OrderMsg.EnterId = this.stuData.EnterId; this.OrderMsg.EnterId = this.stuData.EnterId;
...@@ -620,12 +653,15 @@ export default { ...@@ -620,12 +653,15 @@ export default {
if (e.IsRenewGuest == 0) { if (e.IsRenewGuest == 0) {
this.OrderMsg.DiscountMoney = this.accAdd( this.OrderMsg.DiscountMoney = this.accAdd(
this.OrderMsg.DiscountMoney, this.OrderMsg.DiscountMoney,
this.accMul(this.OrderMsg.Class_Price, this.OrderMsg.B2CRatio/100) this.accMul(this.OrderMsg.Class_Price, this.OrderMsg.B2CRatio / 100)
); );
} else { } else {
this.OrderMsg.DiscountMoney = this.accAdd( this.OrderMsg.DiscountMoney = this.accAdd(
this.OrderMsg.DiscountMoney, this.OrderMsg.DiscountMoney,
this.accMul(this.OrderMsg.Class_Price, this.OrderMsg.B2CReNewRatio/100) this.accMul(
this.OrderMsg.Class_Price,
this.OrderMsg.B2CReNewRatio / 100
)
); );
} }
}); });
...@@ -673,10 +709,10 @@ export default { ...@@ -673,10 +709,10 @@ export default {
this.OrderMsg.CourseId = ""; this.OrderMsg.CourseId = "";
} }
if (this.saveObj.B2CRatio) { if (this.saveObj.B2CRatio) {
this.OrderMsg.B2CRatio = this.saveObj.B2CRatio this.OrderMsg.B2CRatio = this.saveObj.B2CRatio;
} }
if (this.saveObj.B2CReNewRatio) { if (this.saveObj.B2CReNewRatio) {
this.OrderMsg.B2CReNewRatio = this.saveObj.B2CReNewRatio this.OrderMsg.B2CReNewRatio = this.saveObj.B2CReNewRatio;
} }
} }
this.IsShowEditOrder = true; this.IsShowEditOrder = true;
...@@ -789,8 +825,9 @@ export default { ...@@ -789,8 +825,9 @@ export default {
} }
this.OrderMsg.StuIds = this.stuData.StuList.map(e => e.StuId).toString(); this.OrderMsg.StuIds = this.stuData.StuList.map(e => e.StuId).toString();
this.OrderMsg.CustomerId = this.stuData.CustomerId; this.OrderMsg.CustomerId = this.stuData.CustomerId;
setClassOrder(this.OrderMsg).then(res => { setClassOrder(this.OrderMsg)
this.$emit("cancelloading");//取消按钮的加载 .then(res => {
this.$emit("cancelloading"); //取消按钮的加载
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
icon: "iconfont icon-chenggong", icon: "iconfont icon-chenggong",
...@@ -810,17 +847,17 @@ export default { ...@@ -810,17 +847,17 @@ export default {
}); });
} }
}) })
.catch(err=>{ .catch(err => {
this.$emit("cancelloading");//取消按钮的加载 this.$emit("cancelloading"); //取消按钮的加载
if(err.Code==2){ if (err.Code == 2) {
this.inceptionData = err this.inceptionData = err;
this.inception = true; this.inception = true;
} }
}); });
}, },
goorder(){ goorder() {
this.OpenNewUrl('/sale/myOrder', { this.OpenNewUrl("/sale/myOrder", {
OrderId: this.inceptionData.Data, OrderId: this.inceptionData.Data
}); });
this.inception = false; this.inception = false;
}, },
......
<template> <template>
<div class="page-body myOrder"> <div class="page-body myOrder">
<div style="width: 100%;display: flex;justify-content: space-between"> <div
style="width: 100%;display: flex;justify-content: space-between"
v-if="source !=1"
>
<span style="font-size: 20px;font-weight: 400; ">报名统计</span> <span style="font-size: 20px;font-weight: 400; ">报名统计</span>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<span> <span>
<q-toggle v-model="msg.Q_NotCollect" label="只看款未收齐订单" class="q-mb-md" false-value="0" true-value="1" <q-toggle
@input="resetSearch" /> v-model="msg.Q_NotCollect"
label="只看款未收齐订单"
class="q-mb-md"
false-value="0"
true-value="1"
@input="resetSearch"
/>
</span> </span>
<div class="page-option" style="margin-left: 10px;"> <div class="page-option" style="margin-left: 10px;">
<q-btn color="accent" size="sm" class="q-mr-md" label="导出" @click="goexport()" /> <q-btn
color="accent"
size="sm"
class="q-mr-md"
label="导出"
@click="goexport()"
/>
</div> </div>
</div> </div>
</div> </div>
<div v-else style="font-size: 20px;font-weight: 400; margin-bottom:10px">
{{CourseName}}
</div>
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.OrderId" label="订单号" <q-input
@clear="resetSearch" maxlength="10" /> @change="resetSearch"
clearable
dense
standout="bg-primary text-white"
v-model="msg.OrderId"
label="订单号"
@clear="resetSearch"
maxlength="10"
/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" dense standout="bg-primary text-white" v-model="msg.CourseSubject" <q-select
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目" @input="resetSearch"
clearable /> dense
standout="bg-primary text-white"
v-model="msg.CourseSubject"
:options="CourseSubjectList"
option-label="SubjectName"
option-value="Id"
emit-value
map-options
label="所属科目"
clearable
/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.GuestName" label="学生名称" <q-input
@clear="resetSearch" maxlength="20" /> @change="resetSearch"
dense
clearable
standout="bg-primary text-white"
v-model="msg.GuestName"
label="学生名称"
@clear="resetSearch"
maxlength="20"
/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassName" label="班级名称" <q-input
@clear="resetSearch" maxlength="20" /> @change="resetSearch"
dense
clearable
standout="bg-primary text-white"
v-model="msg.ClassName"
label="班级名称"
@clear="resetSearch"
maxlength="20"
/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassNo" label="班号" <q-input
@clear="resetSearch" maxlength="20" /> @change="resetSearch"
</div> dense
clearable
standout="bg-primary text-white"
v-model="msg.ClassNo"
label="班号"
@clear="resetSearch"
maxlength="20"
/>
</div>
<template v-if="source!=1">
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="CourseId" <q-select
option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程" /> @input="resetSearch"
dense
standout="bg-primary text-white"
option-value="CourseId"
option-label="CourseName"
v-model="msg.CouseId"
:options="CourseList"
emit-value
map-options
label="学习课程"
/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select dense @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()" <q-select
standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="msg.OrderState" dense
:options="OrderStateList" emit-value map-options label="订单状态" /> @input="
msg.OrderState == 0
? (msg.Q_OrderState = 1)
: (msg.Q_OrderState = 0),
resetSearch()
"
standout="bg-primary text-white"
option-value="Id"
option-label="Name"
v-model="msg.OrderState"
:options="OrderStateList"
emit-value
map-options
label="订单状态"
/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-field filled dense> <q-field filled dense>
 <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="报名开始时间" size="small" style="width:47%;" <el-date-picker
@change="resetSearch" clear-icon="iconfont icon-guanbi"> v-model="msg.StartTime"
</el-date-picker> type="date"
<el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="报名结束时间" size="small" style="width:47%;" value-format="yyyy-MM-dd"
@change="resetSearch" clear-icon="iconfont icon-guanbi"> placeholder="报名开始时间"
size="small"
style="width:47%;"
@change="resetSearch"
clear-icon="iconfont icon-guanbi"
>
</el-date-picker
>
<el-date-picker
v-model="msg.EndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="报名结束时间"
size="small"
style="width:47%;"
@change="resetSearch"
clear-icon="iconfont icon-guanbi"
>
</el-date-picker> </el-date-picker>
<!-- <el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;" <!-- <el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
 range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间">  range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间">
...@@ -60,54 +163,88 @@ ...@@ -60,54 +163,88 @@
</q-field> </q-field>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-field filled dense> <q-field filled dense>
 <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateList2" @change="resetSearch()" size="mini" value-format="yyyy-MM-dd" type="daterange" style="border:none;" <el-date-picker
 range-separator="至"  start-placeholder="开班开始时间"  end-placeholder="开班结束时间"> v-model="dateList2"
 </el-date-picker>        @change="resetSearch()"
size="mini"
value-format="yyyy-MM-dd"
type="daterange"
style="border:none;"
range-separator="至"
start-placeholder="开班开始时间"
end-placeholder="开班结束时间"
>
</el-date-picker>
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="Id" option-label="EmployeeName" <q-select
v-model="msg.EnterID" :options="EmployeeList" emit-value map-options label="业务员" use-input @input="resetSearch"
@filter="filterFn2" /> dense
standout="bg-primary text-white"
option-value="Id"
option-label="EmployeeName"
v-model="msg.EnterID"
:options="EmployeeList"
emit-value
map-options
label="业务员"
use-input
@filter="filterFn2"
/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="Id" option-label="EmployeeName" <q-select
v-model="msg.HelpEnterId" :options="TeacherList" emit-value map-options label="关联教师" use-input @input="resetSearch"
@filter="filterFn3" /> dense
standout="bg-primary text-white"
option-value="Id"
option-label="EmployeeName"
v-model="msg.HelpEnterId"
:options="TeacherList"
emit-value
map-options
label="关联教师"
use-input
@filter="filterFn3"
/>
</div> </div>
</template>
</div> </div>
</div> </div>
<div class="col row wrap q-gutter-x-md" v-if="data.Statistics"> <div class="col row wrap q-gutter-x-md" v-if="data.Statistics">
<div class="col stics"> <div class="col stics">
<span class="stics-name">应收款</span> <span class="stics-name">应收款</span>
<span>{{data.Statistics.PreferPrice?data.Statistics.PreferPrice:0}}</span> <span>{{
data.Statistics.PreferPrice ? data.Statistics.PreferPrice : 0
}}</span>
</div> </div>
<div class="col stics"> <div class="col stics">
<span class="stics-name">实收款</span> <span class="stics-name">实收款</span>
<span>{{data.Statistics.Income}}</span> <span>{{ data.Statistics.Income }}</span>
</div> </div>
<div class="col stics"> <div class="col stics">
<span class="stics-name">待收款</span> <span class="stics-name">待收款</span>
<span style="color: #F72E52">{{data.Statistics.DueInMoney}}</span> <span style="color: #F72E52">{{ data.Statistics.DueInMoney }}</span>
</div> </div>
<div class="col stics"> <div class="col stics">
<span class="stics-name">收客人数</span> <span class="stics-name">收客人数</span>
<span style="color:#2961FE;">{{data.Statistics.GuestNum}}人</span> <span style="color:#2961FE;">{{ data.Statistics.GuestNum }}人</span>
</div> </div>
<div class="col stics"> <div class="col stics">
<span class="stics-name">取消人数</span> <span class="stics-name">取消人数</span>
<span>{{data.Statistics.CancelNum}}人</span> <span>{{ data.Statistics.CancelNum }}人</span>
</div> </div>
<div class="col stics"> <div class="col stics">
<span class="stics-name">提成金额</span> <span class="stics-name">提成金额</span>
<span>{{data.Statistics.CommissionMoney}}</span> <span>{{ data.Statistics.CommissionMoney }}</span>
</div> </div>
<div class="col stics"> <div class="col stics">
<span class="stics-name">额外奖励</span> <span class="stics-name">额外奖励</span>
<span>{{data.Statistics.ExtraRewardMoney}}</span> <span>{{ data.Statistics.ExtraRewardMoney }}</span>
</div> </div>
</div> </div>
<div class="row col" style="justify-content: flex-end"> <div class="row col" style="justify-content: flex-end">
...@@ -129,39 +266,50 @@ ...@@ -129,39 +266,50 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3" <orderlist
ref="orderL"> :dataList="data.List"
:authObj="authObj"
@success="refreshClassOrder"
:modityOrderType="3"
ref="orderL"
>
</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
color="primary" :input="true"> v-model="msg.pageIndex"
:max="pageCount"
@input="changePage"
class="full-width justify-end"
color="primary"
:input="true"
>
</q-pagination> </q-pagination>
</div> </div>
</div> </div>
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" <classinfo-form
@success="refreshClassOrder"> v-if="isShowClassInfo"
:seting-obj="classObjOption"
@close="closeClass"
@success="refreshClassOrder"
>
</classinfo-form> </classinfo-form>
</div> </div>
</template> </template>
<script> <script>
import { import {
getMyOrderStatisticsPageList, //获取订单列表 getMyOrderStatisticsPageList, //获取订单列表
getOrderStateEnumList //订单状态 getOrderStateEnumList //订单状态
} from '../../api/sale/sale'; } from "../../api/sale/sale";
import { import {
queryCourseDropdownList, queryCourseDropdownList,
getCourseSubject getCourseSubject
} from '../../api/course/index' } from "../../api/course/index";
import myOrderForm from '../../components/sale/myOrder-form' import myOrderForm from "../../components/sale/myOrder-form";
import classinfoForm from '../../components/course/classinfo-form'; import classinfoForm from "../../components/course/classinfo-form";
import orderlist from '../../components/sale/orderlist' import orderlist from "../../components/sale/orderlist";
import { import { queryEmployee } from "../../api/users/user";
queryEmployee import { EduDownLoad } from "../../api/common/common";
} from '../../api/users/user'; export default {
import {
EduDownLoad,
} from '../../api/common/common';
export default {
meta: { meta: {
title: "报名统计" title: "报名统计"
}, },
...@@ -180,23 +328,23 @@ ...@@ -180,23 +328,23 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 8, pageSize: 8,
OrderId: '', //订单号 OrderId: "", //订单号
GuestName: '', //客人名称 GuestName: "", //客人名称
ClassName: '', //班级名称 ClassName: "", //班级名称
CouseId: 0, //课程id CouseId: 0, //课程id
StartTime: '', //报名开始时间 StartTime: "", //报名开始时间
EndTime: '', //报名结束时间 EndTime: "", //报名结束时间
OPStartTime: '', //开班开始时间 OPStartTime: "", //开班开始时间
OPEndTime: '', //开班结束时间 OPEndTime: "", //开班结束时间
Q_NotCollect: '0', //查询未收齐 1是 0否 Q_NotCollect: "0", //查询未收齐 1是 0否
OrderState: 0, //订单状态 枚举 OrderState: 0, //订单状态 枚举
Q_OrderState: 1, //查询 1正常订单 2取消订单 (默认传1 如果 选择了订单状态 则传 0) Q_OrderState: 1, //查询 1正常订单 2取消订单 (默认传1 如果 选择了订单状态 则传 0)
Q_OrderBy: 2, //写死 =2 Q_OrderBy: 2, //写死 =2
PlatformTax: 0, //平台税金 PlatformTax: 0, //平台税金
EnterID: '', //业务员id EnterID: "", //业务员id
ClassNo: '', //班号 ClassNo: "", //班号
HelpEnterId: '', //关联教师 HelpEnterId: "", //关联教师
CourseSubject: "", //所属科目 CourseSubject: "" //所属科目
}, },
//订单状态 //订单状态
OrderStateList: [], OrderStateList: [],
...@@ -215,31 +363,46 @@ ...@@ -215,31 +363,46 @@
isShowRenewClass: false, //显示续课按钮 isShowRenewClass: false, //显示续课按钮
isShowEdit: false, //不显示修改按钮 isShowEdit: false, //不显示修改按钮
isShowBackClass: false, //不显示退课 isShowBackClass: false, //不显示退课
isShowRenewClass: false, //不显示续课 isShowRenewClass: false //不显示续课
}, },
EmployeeList: [], //业务员 EmployeeList: [], //业务员
AllemployeeList: [], AllemployeeList: [],
TeacherList: [], //关联教师 TeacherList: [], //关联教师
AllTeacherList: [], AllTeacherList: [],
CourseSubjectList: [], //科目列表 CourseSubjectList: [], //科目列表
} source: 0,//1:从课程列表进入
CourseName:"",
};
}, },
created() { created() {
if (this.$route.query.OrderId) { if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId; this.msg.OrderId = this.$route.query.OrderId;
} }
console.log("aa", this.$route.query);
let nowDay = new Date(); let nowDay = new Date();
var year = nowDay.getFullYear(); //年 var year = nowDay.getFullYear(); //年
var month = nowDay.getMonth() + 1; //月 var month = nowDay.getMonth() + 1; //月
var day = nowDay.getDate(); //日 var day = nowDay.getDate(); //日
var currentDay = year + '-' + month + '-' + day; var currentDay = year + "-" + month + "-" + day;
this.msg.StartTime = currentDay this.msg.StartTime = currentDay;
if (this.$route.query.source) {
this.source = this.$route.query.source;
if (this.source == 1) {
this.msg.StartTime = ""
}
}
if (this.$route.query.CourseId) {
this.msg.CouseId = this.$route.query.CourseId ;
}
if (this.$route.query.CourseName) {
this.CourseName = decodeURIComponent(this.$route.query.CourseName) ;
}
if (this.$route.query.StartTime) { if (this.$route.query.StartTime) {
this.msg.StartTime = this.$route.query.StartTime + '-01'; this.msg.StartTime = this.$route.query.StartTime + "-01";
} }
if (this.$route.query.EndTime) { if (this.$route.query.EndTime) {
this.msg.EndTime = this.$route.query.EndTime + '-01'; this.msg.EndTime = this.$route.query.EndTime + "-01";
} }
if (this.$route.query.EnterID) { if (this.$route.query.EnterID) {
this.msg.EnterID = Number(this.$route.query.EnterID); this.msg.EnterID = Number(this.$route.query.EnterID);
...@@ -254,7 +417,7 @@ ...@@ -254,7 +417,7 @@
mounted() { mounted() {
this.getList(); this.getList();
this.getEmployee(0); this.getEmployee(0);
this.getglteacher() this.getglteacher();
}, },
methods: { methods: {
queryCourseSubject() { queryCourseSubject() {
...@@ -262,7 +425,7 @@ ...@@ -262,7 +425,7 @@
if (res.Code == 1) { if (res.Code == 1) {
this.CourseSubjectList = res.Data; this.CourseSubjectList = res.Data;
} }
}) });
}, },
//订单状态 //订单状态
getOrderState() { getOrderState() {
...@@ -275,10 +438,10 @@ ...@@ -275,10 +438,10 @@
tempArray.unshift({ tempArray.unshift({
Id: 0, Id: 0,
Name: "不限" Name: "不限"
}) });
this.OrderStateList = tempArray; this.OrderStateList = tempArray;
} }
}) });
}, },
//获取课程 //获取课程
getCourseList() { getCourseList() {
...@@ -291,23 +454,23 @@ ...@@ -291,23 +454,23 @@
tempArray.unshift({ tempArray.unshift({
CourseId: 0, CourseId: 0,
CourseName: "不限" CourseName: "不限"
}) });
this.CourseList = tempArray; this.CourseList = tempArray;
} }
}) });
}, },
//翻页 //翻页
changePage(val) { changePage(val) {
if (this.showone == true) { if (this.showone == true) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList() this.getList();
} else { } else {
this.showone = true this.showone = true;
} }
}, },
resetSearch() { resetSearch() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.getList() this.getList();
}, },
//获取菜单分页列表 //获取菜单分页列表
getList() { getList() {
...@@ -322,35 +485,38 @@ ...@@ -322,35 +485,38 @@
this.msg.OPStartTime = this.dateList2[0]; this.msg.OPStartTime = this.dateList2[0];
this.msg.OPEndTime = this.dateList2[1]; this.msg.OPEndTime = this.dateList2[1];
} else { } else {
this.msg.OPStartTime = ''; this.msg.OPStartTime = "";
this.msg.OPEndTime = ''; this.msg.OPEndTime = "";
} }
let msg = JSON.parse(JSON.stringify(this.msg)); let msg = JSON.parse(JSON.stringify(this.msg));
if (msg.OrderId == '' || msg.OrderId == null) { if (msg.OrderId == "" || msg.OrderId == null) {
msg.OrderId = 0 msg.OrderId = 0;
} }
this.loading = true; this.loading = true;
getMyOrderStatisticsPageList(msg).then(res => { getMyOrderStatisticsPageList(msg)
.then(res => {
this.data = res.Data.PageData; this.data = res.Data.PageData;
let OrderIds = [] let OrderIds = [];
this.data.List.forEach(x => { this.data.List.forEach(x => {
OrderIds.push(x.OrderId) OrderIds.push(x.OrderId);
}) });
this.loading = false this.loading = false;
OrderIds = OrderIds.join(',') OrderIds = OrderIds.join(",");
if (this.data.List.length > 0) { if (this.data.List.length > 0) {
this.$refs.orderL.getOrderFinanceList(OrderIds, 1) this.$refs.orderL.getOrderFinanceList(OrderIds, 1);
} }
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
}).catch(() => {
this.loading = false
}) })
.catch(() => {
this.loading = false;
});
}, },
//刷新页面 //刷新页面
refreshClassOrder() { refreshClassOrder() {
this.getList(); this.getList();
}, },
getClassInfo(obj) { //打开班级详情组件 getClassInfo(obj) {
//打开班级详情组件
this.classObjOption = obj; this.classObjOption = obj;
this.isShowClassInfo = true; this.isShowClassInfo = true;
}, },
...@@ -361,130 +527,139 @@ ...@@ -361,130 +527,139 @@
getglteacher() { getglteacher() {
var qMsg = { var qMsg = {
AccountTypeStr: 2 AccountTypeStr: 2
} };
queryEmployee(qMsg).then(res => { queryEmployee(qMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.TeacherList = res.Data; this.TeacherList = res.Data;
let obj = { let obj = {
Id: "", Id: "",
EmployeeName: "不限" EmployeeName: "不限"
} };
this.TeacherList.unshift(obj) this.TeacherList.unshift(obj);
this.AllTeacherList = JSON.parse(JSON.stringify(this.TeacherList)); this.AllTeacherList = JSON.parse(JSON.stringify(this.TeacherList));
} }
}) });
}, },
//筛选关联老师 //筛选关联老师
filterFn3(val, update) { filterFn3(val, update) {
update(() => { update(() => {
if (val === '') { if (val === "") {
this.TeacherList = JSON.parse(JSON.stringify(this.AllTeacherList)) this.TeacherList = JSON.parse(JSON.stringify(this.AllTeacherList));
} else { } else {
const needle = val.toLowerCase() const needle = val.toLowerCase();
this.TeacherList = this.AllTeacherList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1) this.TeacherList = this.AllTeacherList.filter(
v => v.EmployeeName.toLowerCase().indexOf(needle) > -1
);
} }
}) });
}, },
//业务员 //业务员
getEmployee(id) { getEmployee(id) {
var qMsg = { var qMsg = {
Dept_Id: 0 Dept_Id: 0
} };
qMsg.Dept_Id = id; qMsg.Dept_Id = id;
queryEmployee(qMsg).then(res => { queryEmployee(qMsg)
.then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.EmployeeList = res.Data; this.EmployeeList = res.Data;
let obj = { let obj = {
Id: "", Id: "",
EmployeeName: "不限" EmployeeName: "不限"
};
this.EmployeeList.unshift(obj);
this.AllemployeeList = JSON.parse(
JSON.stringify(this.EmployeeList)
);
} }
this.EmployeeList.unshift(obj)
this.AllemployeeList = JSON.parse(JSON.stringify(this.EmployeeList));
}
}).catch(() => {
}) })
.catch(() => {});
}, },
//筛选业务员 //筛选业务员
filterFn2(val, update) { filterFn2(val, update) {
update(() => { update(() => {
if (val === '') { if (val === "") {
this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList)) this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList));
} else { } else {
const needle = val.toLowerCase() const needle = val.toLowerCase();
this.EmployeeList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1) this.EmployeeList = this.AllemployeeList.filter(
v => v.EmployeeName.toLowerCase().indexOf(needle) > -1
);
} }
}) });
}, },
goexport() { //导出 goexport() {
//导出
var msg = JSON.parse(JSON.stringify(this.msg)); var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/order/GetOrderPageListStatisticsToExcel", msg, "订单列表.xls") EduDownLoad(
"/order/GetOrderPageListStatisticsToExcel",
msg,
"订单列表.xls"
);
} }
} }
} };
</script> </script>
<style> <style>
li { li {
list-style-type: none; list-style-type: none;
} }
.myOrder ul { .myOrder ul {
padding: 0px padding: 0px;
} }
.myOrder .price-popup { .myOrder .price-popup {
border-radius: 4px; border-radius: 4px;
} }
.myOrder .el-range-editor .el-range-input { .myOrder .el-range-editor .el-range-input {
background: transparent; background: transparent;
} }
.myOrder .el-range-editor.el-input__inner { .myOrder .el-range-editor.el-input__inner {
background-color: transparent; background-color: transparent;
} }
.myOrder .q-mb-md { .myOrder .q-mb-md {
margin-bottom: 0; margin-bottom: 0;
} }
.myOrder .stics { .myOrder .stics {
padding: 10px 20px; padding: 10px 20px;
background: #DDDEE0; background: #dddee0;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
color: #000000; color: #000000;
font-weight: bold font-weight: bold;
} }
.myOrder .stics .stics-name { .myOrder .stics .stics-name {
color: #2D2D2D; color: #2d2d2d;
font-weight: 600; font-weight: 600;
margin-right: 10px margin-right: 10px;
} }
.myOrder .tis { .myOrder .tis {
margin: 10px 0; margin: 10px 0;
align-items: center align-items: center;
} }
.myOrder .tis .tis-k { .myOrder .tis .tis-k {
width: 10px; width: 10px;
height: 10px; height: 10px;
margin-right: 8px margin-right: 8px;
} }
.myOrder .tis span { .myOrder .tis span {
font-size: 14px; font-size: 14px;
color: #2D2D2D; color: #2d2d2d;
font-weight: 600; font-weight: 600;
margin-right: 20px margin-right: 20px;
} }
.myOrder .el-input__inner { .myOrder .el-input__inner {
border: none !important; border: none !important;
background: transparent !important; background: transparent !important;
} }
</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