Skip to content

C
confucius
Commit 402471c5 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 492a7a27
Show whitespace changes
Inline Side-by-side
Showing with 381 additions and 515 deletions
src/components/sale/orderlist.vue
View file @ 402471c5
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</div> </div>
</div> </div>
<div class="order_OferTitle" v-if="item.TargetJoinType == 1"> <div class="order_OferTitle" v-if="item.TargetJoinType == 1">
<template v-if="item.JoinType == 3"> <template v-if="item.JoinType == 3 &&item.SourceOrderId>0">
原订单:{{ item.SourceOrderId }} 原订单:{{ item.SourceOrderId }}
</template> </template>
<template v-if="item.JoinType == 4"> <template v-if="item.JoinType == 4">
......
src/pages/sale/orderStatistics.vue
View file @ 402471c5
<template> <template>
<div class="page-body myOrder"> <div class="page-body myOrder">
<div <div style="width: 100%;display: flex;justify-content: space-between" v-if="source != 1">
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 <q-toggle v-model="msg.Q_NotCollect" label="只看款未收齐订单" class="q-mb-md" false-value="0" true-value="1"
v-model="msg.Q_NotCollect" @input="resetSearch" />
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 <q-btn color="accent" size="sm" class="q-mr-md" label="导出" @click="goexport()" />
color="accent"
size="sm"
class="q-mr-md"
label="导出"
@click="goexport()"
/>
</div> </div>
</div> </div>
</div> </div>
...@@ -33,128 +18,50 @@ ...@@ -33,128 +18,50 @@
<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 <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.OrderId"
@change="resetSearch" label="订单号" @clear="resetSearch" maxlength="10" />
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 <q-select @input="resetSearch" dense standout="bg-primary text-white" v-model="msg.CourseSubject"
@input="resetSearch" :options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options
dense label="所属科目" clearable />
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 <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.GuestName"
@change="resetSearch" label="学生名称" @clear="resetSearch" maxlength="20" />
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 <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassName"
@change="resetSearch" label="班级名称" @clear="resetSearch" maxlength="20" />
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 <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassNo"
@change="resetSearch" label="班号" @clear="resetSearch" maxlength="20" />
dense
clearable
standout="bg-primary text-white"
v-model="msg.ClassNo"
label="班号"
@clear="resetSearch"
maxlength="20"
/>
</div> </div>
<template v-if="source != 1"> <template v-if="source != 1">
<div class="col-3"> <div class="col-3">
<q-select <q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="CourseId"
@input="resetSearch" option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程"
dense @filter="filterCourse" use-input />
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 <q-select dense @input="
dense
@input="
msg.OrderState == 0 msg.OrderState == 0
? (msg.Q_OrderState = 1) ? (msg.Q_OrderState = 1)
: (msg.Q_OrderState = 0), : (msg.Q_OrderState = 0),
resetSearch() resetSearch()
" " standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="msg.OrderState"
standout="bg-primary text-white" :options="OrderStateList" emit-value map-options label="订单状态" />
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 <el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="报名开始时间"
v-model="msg.StartTime" size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
type="date" </el-date-picker>至
value-format="yyyy-MM-dd" <el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="报名结束时间"
placeholder="报名开始时间" size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
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>
</template> </template>
</q-field> </q-field>
...@@ -162,52 +69,22 @@ ...@@ -162,52 +69,22 @@
<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 <el-date-picker v-model="dateList2" @change="resetSearch()" size="mini" value-format="yyyy-MM-dd"
v-model="dateList2" type="daterange" style="border:none;" range-separator="至" start-placeholder="开班开始时间"
@change="resetSearch()" end-placeholder="开班结束时间">
size="mini"
value-format="yyyy-MM-dd"
type="daterange"
style="border:none;"
range-separator="至"
start-placeholder="开班开始时间"
end-placeholder="开班结束时间"
>
</el-date-picker> </el-date-picker>
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select <q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="Id"
@input="resetSearch" option-label="EmployeeName" v-model="msg.EnterID" :options="EmployeeList" emit-value map-options
dense label="业务员" use-input @filter="filterFn2" />
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 <q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="Id"
@input="resetSearch" option-label="EmployeeName" v-model="msg.HelpEnterId" :options="TeacherList" emit-value map-options
dense label="关联教师" use-input @filter="filterFn3" />
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> </template>
</div> </div>
...@@ -263,50 +140,39 @@ ...@@ -263,50 +140,39 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3"
:dataList="data.List" ref="orderL">
: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 <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
v-model="msg.pageIndex" color="primary" :input="true">
:max="pageCount"
@input="changePage"
class="full-width justify-end"
color="primary"
:input="true"
>
</q-pagination> </q-pagination>
</div> </div>
</div> </div>
<classinfo-form <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass"
v-if="isShowClassInfo" @success="refreshClassOrder">
: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 { queryEmployee } from "../../api/users/user"; import {
import { EduDownLoad } from "../../api/common/common"; queryEmployee
export default { } from "../../api/users/user";
import {
EduDownLoad
} from "../../api/common/common";
export default {
meta: { meta: {
title: "报名统计" title: "报名统计"
}, },
...@@ -328,7 +194,7 @@ export default { ...@@ -328,7 +194,7 @@ export default {
OrderId: "", //订单号 OrderId: "", //订单号
GuestName: "", //客人名称 GuestName: "", //客人名称
ClassName: "", //班级名称 ClassName: "", //班级名称
CouseId: "0", //课程id CouseId: "", //课程id
StartTime: "", //报名开始时间 StartTime: "", //报名开始时间
EndTime: "", //报名结束时间 EndTime: "", //报名结束时间
OPStartTime: "", //开班开始时间 OPStartTime: "", //开班开始时间
...@@ -596,68 +462,68 @@ export default { ...@@ -596,68 +462,68 @@ export default {
); );
} }
} }
}; };
</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>
\ No newline at end of file
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