Skip to content

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

新增页面

parent 714560dc
Show whitespace changes
Inline Side-by-side
Showing with 238 additions and 115 deletions
src/components/sale/backclass-form.vue 0 → 100644
View file @ c6461536
<!--退课申请-->
<template>
<q-dialog v-model="IsShowBackClassDialog" content-class="bg-grey-1" persistent transition-show="scale"
transition-hide="scale">
<q-card style="width: 400px;max-width:500px;">
<q-card-section>
<div class="text-h6">退课申请</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeBackClassForm" />
<q-btn label="立即提交" color="accent" class="q-px-md" style="font-weight:400 !important"
@click="saveOrderBackClass" />
</q-card-actions>
</q-card>
</q-dialog>
</template>
<script>
import {
getOrderGuestPageList,
} from '../../api/sale/sale'
export default {
name: "backclass-form",
props: {
saveObj: {
type: Object,
default: null,
},
},
data() {
return {
IsShowBackClassDialog: true,
backClassMsg: {
OrderId: 0,
ClassId: 0,
pageIndex: 1,
pageSize: 1000,
},
studentList: [], //学员列表
}
},
created() {
this.backClassMsg.OrderId = this.saveObj.OrderId;
this.backClassMsg.ClassId = this.saveObj.ClassId;
this.getStudentList();
},
methods: {
//关闭弹窗
closeBackClassForm() {
this.IsShowBackClassDialog = false;
this.$emit('close');
},
//获取订单学员列表
getStudentList() {
this.studentList = [];
getOrderGuestPageList(this.backClassMsg).then(res => {
if (res.Code == 1) {
this.studentList = res.Data.PageData;
console.log("res", this.studentList);
}
})
},
//获取学员退课申请
saveOrderBackClass() {
// updateOrderRemark(this.OrderRemarkMsg).then(res => {
// if (res.Code == 1) {
// this.$q.notify({
// icon: 'iconfont icon-chenggong',
// color: 'accent',
// timeout: 2000,
// message: '修改成功！',
// position: 'top'
// })
// //调用父页面成功方法
// this.$emit('success');
// this.IsShowBackClassDialog = false
// }
// })
}
}
}
</script>
src/components/sale/orderlist.vue
View file @ c6461536
......@@ -83,7 +83,7 @@
</q-item>
<q-item clickable v-close-popup>
<q-item-section>
<q-item-label>退课</q-item-label>
<q-item-label @click="showBackClassForm(item)">退课</q-item-label>
</q-item-section>
</q-item>
</q-list>
......@@ -204,11 +204,13 @@
<div class="col">
<div class="row" style="justify-content: space-between">
<span>收款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)"/>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="chanceType(item,1)" />
</div>
<div class="row wrap" >
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" :style="{
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
......@@ -216,10 +218,12 @@
</div>
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)"/>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="chanceType(item,2)" />
</div>
<div class="row wrap" >
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
......@@ -272,41 +276,6 @@
<q-item-label>学生名单</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section @click="transferOrder(item)">
<q-item-label>转交订单</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section @click="editOrderRemark(item,1)">
<q-item-label>销售备注</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section @click="editOrderRemark(item,2)">
<q-item-label>教务备注</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section @click="editOrderRemark(item,3)">
<q-item-label>校长备注</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section @click="editOrderRemark(item,4)">
<q-item-label>经理备注</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section @click="CancelOrder(item)">
<q-item-label>取消</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section>
<q-item-label>退课</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</td>
......@@ -425,11 +394,13 @@
<div class="col">
<div class="row" style="justify-content: space-between">
<span>收款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)"/>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="chanceType(item,1)" />
</div>
<div class="row wrap" >
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" :style="{
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
......@@ -437,10 +408,12 @@
</div>
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)"/>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="chanceType(item,2)" />
</div>
<div class="row wrap" >
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
......@@ -465,9 +438,13 @@
<transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" @close="closeTransOrderForm"
@success="refreshClassOrder"></transOrder-form>
<myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
<!-- 班级详情-->
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass"></classinfo-form>
<!--班级详情-->
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass">
</classinfo-form>
<!--退课申请-->
<backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm"
@success="refreshClassOrder"></backclass-form>
</div>
</template>
......@@ -475,6 +452,7 @@
import editorderForm from '../sale/editorder-form' //修改订单
import orderremarkForm from '../sale/orderremark-form' //订单备注
import transOrderForm from '../sale/transOrder-form' //转交订单
import backclassForm from '../sale/backclass-form' //退课申请
import {
cancelClassOrder, //取消订单
} from '../../api/sale/sale'
......@@ -487,7 +465,8 @@
orderremarkForm,
transOrderForm,
myOrderForm,
classinfoForm
classinfoForm,
backclassForm
},
props: {
//正常订单
......@@ -506,64 +485,73 @@
isShowEditOrderForm: false, //是否显示订单修改
isShowRemarkOrderForm: false, //是否线下修改订单备注
isShowTransOrderForm: false, //是否显示转交订单
isShowBackClassForm: false, //是否显示退课申请
orderObj: {}, //订单信息
isShowCancel: false, //是否显示取消订单
remarkType: 0, //备注类型
isShowmyorderForm:false,//显示详情
myorderObjOption:{},//详情的数据
isShowmyorderForm: false, //显示详情
myorderObjOption: {}, //详情的数据
classObjOption: null,
isShowClassInfo: false, //是否显示课程信息
}
},
created() {
},
created() {},
mounted() {
},
methods: {
getOrderFinanceList(msg,type){
this.apipost('sellorder_post_GetOrderFinanceListForEdu',{OrderIds:msg},res=>{
if(res.data.resultCode===1){
//显示退课申请
showBackClassForm(item) {
this.orderObj = item;
this.isShowBackClassForm = true;
},
//关闭退课申请
closeBackClassForm() {
this.orderObj = {};
this.isShowBackClassForm = false;
},
//获取财务单据
getOrderFinanceList(msg, type) {
this.apipost('sellorder_post_GetOrderFinanceListForEdu', {
OrderIds: msg
}, res => {
if (res.data.resultCode === 1) {
let data = res.data.data;
if(type==1){
if(this.dataList){
this.dataList.forEach(x=>{
data.forEach(j=>{
if(x.OrderId == j.OrderId){
if (type == 1) {
if (this.dataList) {
this.dataList.forEach(x => {
data.forEach(j => {
if (x.OrderId == j.OrderId) {
x.FinanceList = j.FinanceList
x.RefundFinanceList = j.RefundFinanceList
}
})
})
}
}else if(type==2){
if(this.cancelList.length>0){
this.cancelList.forEach(x=>{
data.forEach(j=>{
if(x.OrderId == j.OrderId){
} else if (type == 2) {
if (this.cancelList.length > 0) {
this.cancelList.forEach(x => {
data.forEach(j => {
if (x.OrderId == j.OrderId) {
x.FinanceList = j.FinanceList
x.RefundFinanceList = j.RefundFinanceList
}
})
})
}
}
this.$forceUpdate()
}else{
} else {
this.$message.error(res.data.message);
}
},err=>{})
}, err => {})
},
goOrderdetails(item,tab){
item.tab=tab
this.myorderObjOption= item;
goOrderdetails(item, tab) {
item.tab = tab
this.myorderObjOption = item;
this.isShowmyorderForm = true;
},
closeMOSaveForm(){
closeMOSaveForm() {
this.isShowmyorderForm = false;
},
//订单转交
......@@ -638,29 +626,29 @@
});
},
chanceType(obj,type){
let TCIDARR=[]
chanceType(obj, type) {
let TCIDARR = []
TCIDARR.push(obj.ClassId)
let orderObj = {
OrderID:obj.OrderId,
OrderSource:17,
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID:0,
SourceID: 0,
TCIDList: TCIDARR
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query:{
"Type":type,
"companyID":this.getLocalStorage().School_Id,
query: {
"Type": type,
"companyID": this.getLocalStorage().School_Id,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj),
'tradeWay':obj.tradeWay,
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'tradeWay': obj.tradeWay,
}
});
},
getClassInfo(obj) {//打开班级详情组件
getClassInfo(obj) { //打开班级详情组件
this.classObjOption = obj;
this.isShowClassInfo = true;
},
......@@ -674,35 +662,75 @@
},
}
}
</script>
<style >
li{
list-style-type:none ;
<style>
li {
list-style-type: none;
}
.classorder ul {
padding: 0px
}
.classorder .price-popup {
border-radius: 4px;
}
.classorder ul{padding: 0px}
.classorder .price-popup{border-radius: 4px;}
.classorder .el-range-editor .el-range-input {
background: none;
}
.classorder .el-range-editor.el-input__inner {
background-color: transparent;
}
.classorder .q-mb-md{
.classorder .q-mb-md {
margin-bottom: 0;
}
.classorder .stics{padding:10px 20px;background: #DDDEE0;border-radius: 4px;font-size: 14px;color: #000000;font-weight: bold}
.classorder .stics .stics-name{color: #2D2D2D;font-weight: 600;margin-right: 10px}
.classorder .tis {margin:10px 0;align-items: center}
.classorder .tis .tis-k{width: 10px;height: 10px;margin-right: 8px}
.classorder .tis span{font-size: 14px;color: #2D2D2D;font-weight: 600;margin-right: 20px}
.classorder .stics {
padding: 10px 20px;
background: #DDDEE0;
border-radius: 4px;
font-size: 14px;
color: #000000;
font-weight: bold
}
.classorder .stics .stics-name {
color: #2D2D2D;
font-weight: 600;
margin-right: 10px
}
.classorder .tis {
margin: 10px 0;
align-items: center
}
.classorder .tis .tis-k {
width: 10px;
height: 10px;
margin-right: 8px
}
.classorder .tis span {
font-size: 14px;
color: #2D2D2D;
font-weight: 600;
margin-right: 20px
}
.classorder table {
padding: 10px 0 ;
padding: 10px 0;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.classorder table th {
background-color: #ededed;
height: 34px;
......@@ -746,6 +774,7 @@
.classorder table tr._color_666 th {
padding: 9px 15px;
}
.classorder .enrollTotalSearchTable {
width: 100%;
font-size: 14px;
......@@ -754,6 +783,7 @@
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.classorder .enrollTotalSearchTable tr {
/* border-bottom: 2px solid #333; */
}
......@@ -798,11 +828,13 @@
.classorder .enrollTotalSearchTable tr td p {
line-height: 20px;
}
.classorder .remarks{
.classorder .remarks {
font-size: 14px;
color: #2D2D2D;
}
.classorder .remarks-b{
.classorder .remarks-b {
width: 100%;
height: 94px;
background: #F0F5FB;
......@@ -812,22 +844,29 @@
color: #999999;
position: relative;
overflow: hidden;
display:-webkit-box;
display: -webkit-box;
line-height: 20px;
-webkit-line-clamp:4;
-webkit-box-orient:vertical ;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
}
.classorder .remarks-b-b{
text-align: right;position: absolute;right: 0px;bottom: 0px
.classorder .remarks-b-b {
text-align: right;
position: absolute;
right: 0px;
bottom: 0px
}
.classorder .on-left{
.classorder .on-left {
margin-right: 5px;
}
.classorder .finance{
.classorder .finance {
padding: 1px 10px;
align-items: center;
justify-content: center;
border-radius: 4px;
margin: 5px 3px 3px 0;
}
</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