Skip to content

C
confucius
Commit c75ad64e authored by 罗超's avatar 罗超
Browse files
Options

1

parent 01f1a2ba
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 165 deletions
src/components/school/student/stulist.vue
View file @ c75ad64e
...@@ -309,6 +309,7 @@ ...@@ -309,6 +309,7 @@
}, },
refreshStuList() { refreshStuList() {
this.$emit("success"); this.$emit("success");
this.selection=[]
}, },
EditStudent(obj) { EditStudent(obj) {
if (obj) { if (obj) {
......
src/components/school/student/transfer-order.vue
View file @ c75ad64e
<template> <template>
<q-dialog <div class="transfer-order">
v-model="persistent" <q-dialog
persistent v-model="persistent"
content-class="bg-grey-1" persistent
transition-show="scale" content-class="bg-grey-1"
transition-hide="scale" transition-show="scale"
class="addactivetype" transition-hide="scale"
@hide="$emit('close')" @hide="$emit('close')"
> >
<q-card style="width: 800px;max-width:800px;"> <q-card style="width: 800px;max-width:800px;">
<q-card-section class="row items-center q-pb-none"> <q-card-section class="row items-center q-pb-none">
<div class="text-h6">转订单</div> <div class="text-h6">转订单</div>
<q-space /> <q-space />
<q-btn icon="close" flat round dense v-close-popup /> <q-btn icon="close" flat round dense v-close-popup />
</q-card-section> </q-card-section>
<q-card-section class="q-pt-none scroll" style="max-height: 80vh"> <q-card-section class="q-pt-none scroll" >
<q-stepper v-model="step" ref="stepper" color="primary" animated flat> <q-stepper v-model="step" ref="stepper" color="primary" animated flat>
<q-step :name="1" title="选择课程" icon="settings" :done="step > 1"> <q-step :name="1" title="选择课程" icon="settings" :done="step > 1">
<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-select <q-select
@input="resetSearch" @input="resetSearch"
filled filled
option-value="SId" option-value="SId"
option-label="SName" option-label="SName"
v-model="courseMsg.School_Id" v-model="courseMsg.School_Id"
:options="schoolList" :options="schoolList"
emit-value emit-value
map-options map-options
label="关联校区" label="关联校区"
clearable clearable
/> />
</div> </div>
<div class="col-3">
<q-input
@change="resetSearch"
clearable
filled
v-model="courseMsg.ClassNo"
label="班号"
@clear="resetSearch"
maxlength="20"
/>
</div>
<div class="col-6">
<q-input
@change="resetSearch"
clearable
filled
v-model="courseMsg.ClassName"
label="班级名称"
@clear="resetSearch"
maxlength="20"
/>
</div>
<div class="col-6">
<q-select
@input="resetSearch"
@filter="filterCourseFn"
use-input
filled
option-value="CourseId"
option-label="CourseName"
v-model="courseMsg.CouseId"
:options="myClassList"
emit-value
map-options
label="学习课程"
clearable
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-6"> <div class="col-3">
<div class="col-3 Sysuser_Date"> <q-input
<q-field filled> @change="resetSearch"
<template v-slot:control> clearable
<el-date-picker filled
v-model="courseMsg.StartTime" v-model="courseMsg.ClassNo"
type="date" label="班号"
placeholder="开学日期" @clear="resetSearch"
size="small" maxlength="20"
style="width:47%;" />
@change="resetSearch" </div>
clear-icon="iconfont icon-guanbi" <div class="col-6">
> <q-input
</el-date-picker @change="resetSearch"
>至 clearable
<el-date-picker filled
v-model="courseMsg.EndTime" v-model="courseMsg.ClassName"
type="date" label="班级名称"
placeholder="结束日期" @clear="resetSearch"
size="small" maxlength="20"
style="width:47%;" />
@change="resetSearch" </div>
clear-icon="iconfont icon-guanbi" <div class="col-6">
> <q-select
</el-date-picker> @input="resetSearch"
@filter="filterCourseFn"
use-input
filled
option-value="CourseId"
option-label="CourseName"
v-model="courseMsg.CouseId"
:options="myClassList"
emit-value
map-options
label="学习课程"
clearable
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template> </template>
</q-field> </q-select>
</div>
<div class="col-6">
<div class="col-3 Sysuser_Date">
<q-field filled>
<template v-slot:control>
<el-date-picker
v-model="courseMsg.StartTime"
type="date"
placeholder="开学日期"
size="small"
style="width:47%;"
@change="resetSearch"
clear-icon="iconfont icon-guanbi"
>
</el-date-picker
>至
<el-date-picker
v-model="courseMsg.EndTime"
type="date"
placeholder="结束日期"
size="small"
style="width:47%;"
@change="resetSearch"
clear-icon="iconfont icon-guanbi"
>
</el-date-picker>
</template>
</q-field>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <Course
<Course :dataList="courseData" @select="selectCourse"></Course> :dataList="courseData"
<q-pagination @select="selectCourse"
class="full-width justify-end" :select="defaultCourse"
v-model="courseMsg.pageIndex" ></Course>
color="primary" <q-pagination
:max="coursePageCount" class="full-width justify-end"
:input="true" v-model="courseMsg.pageIndex"
@input="changePage" color="primary"
/> :max="coursePageCount"
</q-step> :input="true"
<q-step :name="2" title="确认" icon="settings" :done="step > 2"> @input="changePage"
<orderForm />
ref="orderForm" </q-step>
:save-obj="saveObj" <q-step :name="2" title="确认" icon="settings" :done="step > 2">
:stuData="stuData" <orderForm
:modityOrderType="1" ref="orderForm"
@success="$emit('close')" :save-obj="saveObj"
></orderForm> :stuData="stuData"
</q-step> :modityOrderType="1"
</q-stepper> @success="$emit('close')"
</q-card-section> ></orderForm>
<q-card-actions align="right" class="bg-white q-mx-md "> </q-step>
<q-btn </q-stepper>
label="取消" </q-card-section>
flat <q-card-actions align="right" class="bg-white q-mx-md ">
color="grey-10" <q-btn
style="font-weight:400 !important" label="取消"
v-close-popup flat
/> color="grey-10"
<q-btn style="font-weight:400 !important"
@click="$refs.stepper.previous()" v-close-popup
color="primary" />
label="上一步" <q-btn
v-if="step > 1" @click="$refs.stepper.previous()"
/> color="primary"
<q-btn @click="next" color="primary" label="下一步" v-if="step < 2" /> label="上一步"
<q-btn v-if="step > 1"
label="保存" />
color="primary" <q-btn @click="next" color="primary" label="下一步" v-if="step < 2" />
@click="saveOrderForm" <q-btn
v-if="step == 2" label="保存"
/> color="primary"
</q-card-actions> @click="saveOrderForm"
</q-card> v-if="step == 2"
</q-dialog> />
</q-card-actions>
</q-card>
</q-dialog>
</div>
</template> </template>
<script> <script>
...@@ -224,7 +229,7 @@ export default { ...@@ -224,7 +229,7 @@ export default {
}, },
courseMsg: { courseMsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 9, pageSize: 8,
ClassName: "", //班级名称 ClassName: "", //班级名称
StartTime: "", //开始时间 StartTime: "", //开始时间
EndTime: "", //结束时间 EndTime: "", //结束时间
...@@ -240,11 +245,12 @@ export default { ...@@ -240,11 +245,12 @@ export default {
courseData: [], //课程列表 courseData: [], //课程列表
coursePageCount: 0, //课程页数 coursePageCount: 0, //课程页数
saveObj: {}, //所选课程 saveObj: {}, //所选课程
defaultCourse: [], //默认课程
//关联校区列表 //关联校区列表
schoolList: [], schoolList: [],
ClassList: [], //关联课程下拉数据 ClassList: [], //关联课程下拉数据
myClassList: [], myClassList: [],
allClassList:[], allClassList: []
}; };
}, },
mounted() { mounted() {
...@@ -340,6 +346,7 @@ export default { ...@@ -340,6 +346,7 @@ export default {
selectCourse(val) { selectCourse(val) {
this.saveObj = val[0]; this.saveObj = val[0];
this.saveObj.Unit_Price = this.saveObj.SellPrice; this.saveObj.Unit_Price = this.saveObj.SellPrice;
this.defaultCourse = val;
}, },
next() { next() {
if (!this.saveObj.ClassId || this.saveObj.ClassId == 0) { if (!this.saveObj.ClassId || this.saveObj.ClassId == 0) {
...@@ -370,7 +377,7 @@ export default { ...@@ -370,7 +377,7 @@ export default {
CourseName: "不限" CourseName: "不限"
}); });
this.myClassList = this.ClassList; this.myClassList = this.ClassList;
this.allClassList= res.Data this.allClassList = res.Data;
} }
}); });
}, },
...@@ -402,4 +409,4 @@ export default { ...@@ -402,4 +409,4 @@ export default {
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
</style> </style>
\ No newline at end of file
src/components/school/student/transfer-order/courselist.vue
View file @ c75ad64e
...@@ -30,6 +30,10 @@ export default { ...@@ -30,6 +30,10 @@ export default {
dataList: { dataList: {
type: Array, type: Array,
default: () => [] default: () => []
},
select:{
type: Array,
default: () => []
} }
}, },
data() { data() {
...@@ -67,10 +71,13 @@ export default { ...@@ -67,10 +71,13 @@ export default {
] ]
}; };
}, },
mounted() {
this.selection=this.select
},
methods: { methods: {
emitSel(val){ emitSel(val){
this.$emit("select",val) this.$emit("select",val)
} },
} }
}; };
</script> </script>
......
src/components/school/student/transfer-order/order-form.vue
View file @ c75ad64e
<style>
.field {
height: 60px;
}
</style>
<!--订单操作--> <!--订单操作-->
<template> <template>
<div> <div>
<div class="row q-mb-md"> <div class="row q-mb-md">
<div class="col-10"> <div class="col-10 flex">
<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 }}
...@@ -419,7 +414,7 @@ export default { ...@@ -419,7 +414,7 @@ export default {
StuIds: "", StuIds: "",
// NormalCommission:'',//正常返佣金额 // NormalCommission:'',//正常返佣金额
// RenewCommission:"",// 预计返佣金额 // RenewCommission:"",// 预计返佣金额
isChaBan: 0 isChaBan: 0,
}, },
Unit_PriceRemark: "", //单价规则 Unit_PriceRemark: "", //单价规则
IsShowUpPrice: false, //是否显示高于定价 IsShowUpPrice: false, //是否显示高于定价
......
src/pages/sale/mystu.vue
View file @ c75ad64e
...@@ -197,4 +197,10 @@ ...@@ -197,4 +197,10 @@
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style>
<style scoped>
/deep/.el-input__inner, /deep/.el-range-input {
background-color: transparent;
border: none;
}
</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