Skip to content

C
confucius
Commit 4316c6c8 authored by zhengke's avatar zhengke
Browse files
Options

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

parents 31b48480 a8ae3b10
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 55 deletions
src/components/sale/offertransorder-form.vue
View file @ 4316c6c8
......@@ -216,16 +216,14 @@
},
{
name: "ClassId",
required: true,
label: "班级",
align: "left",
field: row => row.ClassId
},
],
//表格可见列
visibleColumns: [
'CourseName', 'OriginalPrice', 'JoinNum', "DiscountPrice", "DiscountRemark", "ActualPrice",
"ClassId",
'CourseName', 'OriginalPrice', 'JoinNum', 'DiscountPrice', 'DiscountRemark', 'ActualPrice',
'ClassId'
], //可见列
pageInfo: {
pageIndex: 1,
......
src/components/sale/orderlist.vue
View file @ 4316c6c8
......@@ -291,8 +291,8 @@
<div class="col">
<div class="row" style="justify-content: space-between">
<span>收款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" style="font-weight:400;color: #02C499" label="修改"
@click="chanceType(item,1)" />
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
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"
......@@ -304,8 +304,8 @@
</div>
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" style="font-weight:400;color: #02C499" label="修改"
@click="chanceType(item,2)" />
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
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"
......@@ -502,7 +502,7 @@
</div>
</div>
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" />
</div>
......@@ -522,34 +522,34 @@
<!--取消订单-->
</table>
<!--修改订单-->
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm"
@success="refreshClassOrder"></editorder-form>
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm" @success="refreshOrder">
</editorder-form>
<!--修改订单备注-->
<orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType"
@close="closeRemarkForm" @success="refreshClassOrder"></orderremark-form>
@close="closeRemarkForm" @success="refreshOrder"></orderremark-form>
<!--转交订单-->
<transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList"
@close="closeTransOrderForm" @success="refreshClassOrder"></transOrder-form>
@close="closeTransOrderForm" @success="refreshOrder"></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 v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshOrder">
</classinfo-form>
<!--退课申请-->
<backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm"
@success="refreshClassOrder"></backclass-form>
<backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm" @success="refreshOrder">
</backclass-form>
<!-- 修改提成和额外奖励 -->
<money-form v-if="isShowMoney" :data="moneyObj" :type="CommonType" @close="closeMoneyForm" @success="refreshMoney">
<money-form v-if="isShowMoney" :data="moneyObj" :type="CommonType" @close="closeMoneyForm" @success="refreshOrder">
</money-form>
<!--续课申请-->
<continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm"
@success="refreshClassOrder"></continueclass-form>
@success="refreshOrder"></continueclass-form>
<!-- 查看报价单 -->
<viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota"
@success="refreshView">
@success="refreshOrder">
</viewquotation-form>
</div>
......@@ -696,20 +696,17 @@
this.AuthorityObj.isShowRenewClass = this.authObj.isShowRenewClass;
}
}
console.log(" this.AuthorityObj", this.AuthorityObj)
},
//关闭报价单
closeQuota() {
this.isShowviewQuo = false;
},
//刷新页面
refreshView() {
},
//跳转到报价单
goQuotation(Id) {
this.offerId = Id;
this.isShowviewQuo = true;
},
//弹出退课名单
getTkshow(data) {
let Tkshow = false;
if (data.length > 0) {
......@@ -721,6 +718,16 @@
}
return Tkshow
},
//关闭退课申请
closeBackClassForm() {
this.orderObj = {};
this.isShowBackClassForm = false;
},
//显示退课申请
showBackClassForm(item) {
this.orderObj = item;
this.isShowBackClassForm = true;
},
//显示续课申请
showContinueClass(item) {
this.orderObj = item;
......@@ -731,16 +738,7 @@
this.orderObj = {};
this.isShowContinueClass = false;
},
//显示退课申请
showBackClassForm(item) {
this.orderObj = item;
this.isShowBackClassForm = true;
},
//关闭退课申请
closeBackClassForm() {
this.orderObj = {};
this.isShowBackClassForm = false;
},
//获取员工列表
Employee() {
var qMsg = {
EmployeeName: ''
......@@ -749,8 +747,6 @@
if (res.Code == 1) {
this.EmployeeList = res.Data;
}
}).catch(() => {
})
},
//获取财务单据
......@@ -789,11 +785,13 @@
}
}, err => {})
},
//显示订单详情
goOrderdetails(item, tab) {
item.tab = tab
this.myorderObjOption = item;
this.isShowmyorderForm = true;
},
//关闭订单详情
closeMOSaveForm() {
this.isShowmyorderForm = false;
},
......@@ -837,8 +835,9 @@
this.isShowEditOrderForm = true;
},
//刷新页面
refreshClassOrder() {
refreshOrder() {
this.isShowEditOrderForm = false;
this.isShowMoney = false;
//调用父页面成功方法
this.$emit('success');
},
......@@ -847,11 +846,6 @@
this.moneyObj = {};
this.isShowMoney = false;
},
//修改提成和额外奖励后刷新
refreshMoney() {
this.isShowMoney = false;
this.$emit('success');
},
//取消订单
CancelOrder(item) {
let that = this
......@@ -879,10 +873,9 @@
this.$emit('success');
}
})
}).onCancel(() => {
});
})
},
//财务单据
chanceType(obj, type) {
let TCIDARR = []
TCIDARR.push(obj.ClassId);
......@@ -918,7 +911,8 @@
}
});
},
getClassInfo(obj) { //打开班级详情组件
//打开班级详情组件
getClassInfo(obj) {
this.classObjOption = obj;
this.classObjOption.School_Id = this.classObjOption.ClassSchoolId
this.isShowClassInfo = true;
......@@ -926,10 +920,6 @@
//关闭班级信息弹窗
closeClass() {
this.isShowClassInfo = false
},
//刷新
refreshClass() {
},
//修改提成-奖励
upDateMoney(item, type) {
......
src/components/sale/transOrder-form.vue
View file @ 4316c6c8
......@@ -86,7 +86,6 @@
},
//保存订单转交
saveTransOrder() {
if(this.saveObj.type==1){
let transMsg = {
OrderId: this.TransOrderMsg.OrderId,
......@@ -126,9 +125,7 @@
}
})
}
}
}
}
</script>
</script>
\ No newline at end of file
src/pages/sale/studentList.vue
View file @ 4316c6c8
......@@ -4,7 +4,7 @@
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title" @click="goreturn">返回</div>
<div class="col-2 q-table__title" @click="goreturn" style="cursor:pointer">返回</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" v-if="isShowBtn" icon="add" label="新增名单" @click="addxue" />
......
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