Skip to content

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

1

parent a7b9bfd4
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 273 deletions
src/components/school/student/abroad-form.vue
View file @ c9ce4794
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</q-step> </q-step>
<q-step :name="2" title="确认" icon="settings" :done="step > 2"> <q-step :name="2" title="确认" icon="settings" :done="step > 2">
<studyForm ref="orderForm" :save-obj="saveObj" @success="$emit('close')" @cancelloading='cancelloading'></studyForm> <studyForm ref="orderForm" :save-obj="saveObj" :select="selectedArr" @success="$emit('close')" @cancelloading='cancelloading'></studyForm>
</q-step> </q-step>
</q-stepper> </q-stepper>
</q-card-section> </q-card-section>
...@@ -92,10 +92,14 @@ ...@@ -92,10 +92,14 @@
Id: 2, Id: 2,
Name: '就业' Name: '就业'
}], }],
PageCount: 0 PageCount: 0,
selectedArr:[]
}; };
}, },
mounted() { mounted() {
if(this.select){
this.selectedArr = this.select;
}
this.getList(); this.getList();
}, },
methods: { methods: {
...@@ -119,7 +123,6 @@ ...@@ -119,7 +123,6 @@
selectCourse(val) { selectCourse(val) {
if(val&&val.length>0){ if(val&&val.length>0){
this.saveObj = val[0]; this.saveObj = val[0];
this.saveObj.Id = this.saveObj.Id;
this.defaultCourse = val; this.defaultCourse = val;
} }
}, },
......
src/components/school/student/transfer-order/study-form.vue
View file @ c9ce4794
...@@ -2,99 +2,25 @@ ...@@ -2,99 +2,25 @@
<template> <template>
<div> <div>
<div class="q-mb-sm text-accent"> <div class="q-mb-sm text-accent">
<span class="text-primary" v-if="mode === 1">班级：</span> <span>{{ saveObj.ClassName }}</span>
<span v-if="mode === 1">{{ saveObj.ClassName }}</span>
<span class="q-ml-md text-primary">课程：</span>{{ saveObj.CourseName }}
</div>
<div class="row q-mb-md">
<!-- <div class="col-10 flex">
<div v-for="(item, index) in stuData.StuList">
<q-chip icon="person" class="primary"
>{{ item.StuName }}
<span v-if="item.IsRenewGuest === 1">(续费)</span>
</q-chip>
</div>
</div> -->
<div class="col-2" v-if="mode == 1">
<q-toggle
v-model="OrderMsg.IsChaBan"
:true-value="1"
:false-value="0"
label="插班报入"
/>
</div>
</div> </div>
<div style="row items-center"> <div style="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">
<q-input <q-input filled stack-label maxlength="3" :dense="false" @keyup.native="checkInteger(OrderMsg, 'GuestNum')"
filled v-model="OrderMsg.GuestNum" @input="calcPrice()" label="人数" :rules="[val => !!val || '请填写人数']" disable
stack-label class="col-6 q-py-sm" />
maxlength="3" <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" :disable="true" @input="calcPrice()"
:dense="false" class="col-6 q-py-sm" label="成交单价" :rules="[val => !!val || '请填成交单价']" />
@keyup.native="checkInteger(OrderMsg, 'GuestNum')" <q-input filled stack-label :dense="false" v-model="OrderMsg.DiscountMoney" :disable="true"
v-model="OrderMsg.GuestNum" class="col-6 q-py-sm" label="优惠金额" />
@input="calcPrice()" <q-input filled stack-label :disable="true" :dense="false" maxlength="10"
label="人数" @keyup.native="checkPrice(OrderMsg, 'PreferPrice')" v-model="OrderMsg.PreferPrice" class="col-6 q-py-sm"
:rules="[val => !!val || '请填写人数']" label="应收" />
disable <q-select standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="OrderMsg.OrderSource"
class="col-6 q-py-sm" :options="SourceEnumList" emit-value map-options class="col-6 q-py-sm" label="客人来源" />
/> <q-select v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled use-input label="协助老师"
<q-input option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-py-sm" emit-value map-options
filled @filter="filterFn">
stack-label
:dense="false"
v-model="OrderMsg.Unit_Price"
:disable="true"
@input="calcPrice()"
class="col-6 q-py-sm"
label="成交单价"
:rules="[val => !!val || '请填成交单价']"
/>
<q-input
filled
stack-label
:dense="false"
v-model="OrderMsg.DiscountMoney"
:disable="true"
class="col-6 q-py-sm"
label="优惠金额"
/>
<q-input
filled
stack-label
:disable="true"
:dense="false"
maxlength="10"
@keyup.native="checkPrice(OrderMsg, 'PreferPrice')"
v-model="OrderMsg.PreferPrice"
class="col-6 q-py-sm"
label="应收"
/>
<q-select
standout="bg-primary text-white"
option-value="Id"
option-label="Name"
v-model="OrderMsg.OrderSource"
:options="SourceEnumList"
emit-value
map-options
class="col-6 q-py-sm"
label="客人来源"
/>
<q-select
v-model="OrderMsg.HelpEnterId"
:options="EmployeeList"
filled
use-input
label="协助老师"
option-label="EmployeeName"
option-value="Id"
ref="EmployeeName"
class="col-6 q-py-sm"
emit-value
map-options
@filter="filterFn"
>
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey"> <q-item-section class="text-grey">
...@@ -103,20 +29,9 @@ ...@@ -103,20 +29,9 @@
</q-item> </q-item>
</template> </template>
</q-select> </q-select>
<q-select <q-select v-model="OrderMsg.CourseConsultantId" :options="EmployeeList2" filled use-input label="课程顾问"
v-model="OrderMsg.CourseConsultantId" option-label="EmployeeName" option-value="Id" ref="EmployeeName2" class="col-6 q-py-sm" emit-value map-options
:options="EmployeeList2" @filter="filterFn2">
filled
use-input
label="课程顾问"
option-label="EmployeeName"
option-value="Id"
ref="EmployeeName2"
class="col-6 q-py-sm"
emit-value
map-options
@filter="filterFn2"
>
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey"> <q-item-section class="text-grey">
...@@ -125,23 +40,13 @@ ...@@ -125,23 +40,13 @@
</q-item> </q-item>
</template> </template>
</q-select> </q-select>
<q-input <q-input filled stack-label :dense="false" v-model="OrderMsg.SaleRemark" type="textarea" class="col-12 q-py-sm"
filled label="备注" />
stack-label
:dense="false"
v-model="OrderMsg.SaleRemark"
type="textarea"
class="col-12 q-py-sm"
label="备注"
/>
</div> </div>
</div> </div>
<div <div class="dialog-out-close" @click="closeEditOrder"
class="dialog-out-close" style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
@click="closeEditOrder"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;"
>
<q-icon name="iconfont icon-jujue1" size="26px" /> <q-icon name="iconfont icon-jujue1" size="26px" />
</div> </div>
<q-dialog v-model="inception"> <q-dialog v-model="inception">
...@@ -156,169 +61,172 @@ ...@@ -156,169 +61,172 @@
<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 <q-btn label="立即查看" size="sm" color="accent q-px-md" style="font-weight:400 !important" @click="goorder" />
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>
import { import {
getClassOrderInfo, //获取订单操作日志列表 getClassOrderInfo, //获取订单操作日志列表
getOrderSourceEnumList, //获取订单来源 枚举 getOrderSourceEnumList, //获取订单来源 枚举
setClassOrder, //修改订单 setClassOrder, //修改订单
queryChaClassInfo, queryChaClassInfo,
} from "../../../../api/sale/sale"; } from "../../../../api/sale/sale";
import { queryEmployee } from "../../../../api/users/user"; //获取员工 import {
export default { queryEmployee
props: { } from "../../../../api/users/user"; //获取员工
saveObj: { export default {
type: Object, props: {
default: null saveObj: {
}, type: Object,
mode: { default: null
type: Number, //1:约课，2：班课 },
default: 1 select: {
}, type: Array,
//订单类型 default: () => []
orderType: { },
type: Number,
default: 1
}, },
schoolList: { data() {
type: Array, return {
default: () => [] IsShowEditOrder: true,
}
},
data() {
return {
IsShowEditOrder: true,
UnitPrice: 0, UnitPrice: 0,
SourceEnumList: [], //订单来源 SourceEnumList: [], //订单来源
EmployeeList: [], //教师列表 EmployeeList: [], //教师列表
AllemployeeList: [], //所有教师列表 AllemployeeList: [], //所有教师列表
EmployeeList2: [], //课程顾问列表 EmployeeList2: [], //课程顾问列表
AllemployeeList2: [], //所有课程顾问列表 AllemployeeList2: [], //所有课程顾问列表
inception: false, inception: false,
inceptionData: null, inceptionData: null,
OrderMsg:{} OrderMsg: {
}; OrderType:2,
}, GuestNum:1, //人数
created() { Unit_Price:'', //成交单价
if (this.saveObj && this.saveObj.CourseId) { DiscountMoney:0, //优惠金额
this.OrderMsg.CourseId = this.saveObj.CourseId; PreferPrice:'', //应收
} OrderSource:'', //客人来源
this.getOrderSEList(); HelpEnterId:'', //协助老师
this.getEmployee(0); CourseConsultantId:'', //课程顾问
this.getEmployee(2); SourceId:1, //传入Id
this.initConfig(); SaleRemark:'' //备注
},
mounted() {
this.initData();
},
methods: {
//获取班级课程信息
initConfig() {
},
//计算课程单价和应收金额
calcPrice() {
},
initData() {
},
//筛选员工
filterFn(val, update) {
update(() => {
if (val === "") {
this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList));
} else {
const needle = val.toLowerCase();
this.EmployeeList = this.AllemployeeList.filter(
v => v.EmployeeName.toLowerCase().indexOf(needle) > -1
);
}
});
},
//筛选课程顾问
filterFn2(val, update) {
update(() => {
if (val === "") {
this.EmployeeList2 = JSON.parse(
JSON.stringify(this.AllemployeeList2)
);
} else {
const needle = val.toLowerCase();
this.EmployeeList2 = this.AllemployeeList2.filter(
v => v.EmployeeName.toLowerCase().indexOf(needle) > -1
);
} }
});
},
//获取业务员
getEmployee(n) {
var qMsg = {
IsLeave: 1,
UserRole: n
}; };
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
if (n == 0) {
//教师
this.EmployeeList = res.Data;
this.AllemployeeList = res.Data;
let obj = {
Id: 0,
EmployeeName: "不限"
};
this.EmployeeList.unshift(obj);
}
if (n == 2) {
//课程顾问
this.EmployeeList2 = res.Data;
this.AllemployeeList2 = res.Data;
let obj = {
Id: 0,
EmployeeName: "不限"
};
this.EmployeeList2.unshift(obj);
}
}
});
},
//关闭弹窗
closeEditOrder() {
this.IsShowEditOrder = false;
this.$emit("close");
},
//获取订单来源
getOrderSEList() {
getOrderSourceEnumList({}).then(res => {
if (res.Code == 1) {
var tempArray = res.Data;
this.SourceEnumList = tempArray;
this.OrderMsg.OrderSource = tempArray[0].Id;
}
});
}, },
//修改订单 created() {
saveOrderInfo() { console.log(this.saveObj,'saveObj');
console.log(this.select,'select');
if (this.saveObj) {
this.OrderMsg.SourceId = this.saveObj.Id;
this.OrderMsg.Unit_Price = this.saveObj.SellPrice;
this.OrderMsg.PreferPrice = this.OrderMsg.Unit_Price;
}
this.getOrderSEList();
this.getEmployee(0);
this.getEmployee(2);
this.initConfig();
}, },
goorder() { mounted() {
this.OpenNewUrl("/sale/myOrder", { this.initData();
OrderId: this.inceptionData.Data
});
this.inception = false;
}, },
} methods: {
}; //获取班级课程信息
initConfig() {
},
//计算课程单价和应收金额
calcPrice() {
},
initData() {
},
//筛选员工
filterFn(val, update) {
update(() => {
if (val === "") {
this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList));
} else {
const needle = val.toLowerCase();
this.EmployeeList = this.AllemployeeList.filter(
v => v.EmployeeName.toLowerCase().indexOf(needle) > -1
);
}
});
},
//筛选课程顾问
filterFn2(val, update) {
update(() => {
if (val === "") {
this.EmployeeList2 = JSON.parse(
JSON.stringify(this.AllemployeeList2)
);
} else {
const needle = val.toLowerCase();
this.EmployeeList2 = this.AllemployeeList2.filter(
v => v.EmployeeName.toLowerCase().indexOf(needle) > -1
);
}
});
},
//获取业务员
getEmployee(n) {
var qMsg = {
IsLeave: 1,
UserRole: n
};
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
if (n == 0) {
//教师
this.EmployeeList = res.Data;
this.AllemployeeList = res.Data;
let obj = {
Id: 0,
EmployeeName: "不限"
};
this.EmployeeList.unshift(obj);
}
if (n == 2) {
//课程顾问
this.EmployeeList2 = res.Data;
this.AllemployeeList2 = res.Data;
let obj = {
Id: 0,
EmployeeName: "不限"
};
this.EmployeeList2.unshift(obj);
}
}
});
},
//关闭弹窗
closeEditOrder() {
this.IsShowEditOrder = false;
this.$emit("close");
},
//获取订单来源
getOrderSEList() {
getOrderSourceEnumList({}).then(res => {
if (res.Code == 1) {
var tempArray = res.Data;
this.SourceEnumList = tempArray;
this.OrderMsg.OrderSource = tempArray[0].Id;
}
});
},
//修改订单
saveOrderInfo() {
},
goorder() {
this.OpenNewUrl("/sale/myOrder", {
OrderId: this.inceptionData.Data
});
this.inception = false;
},
}
};
</script> </script>
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