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;
}, },
......
This diff is collapsed.
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