Commit 7d947a57 authored by zhengke's avatar zhengke

no message

parent 6f0a6329
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</q-step> </q-step>
<q-step :name="3" title="确认" icon="settings" :done="step > 3"> <q-step :name="3" title="确认" icon="settings" :done="step > 3">
<orderForm ref="orderForm" :mode="mode" :schoolList="schoolList" :save-obj="saveObj" :stuData="stuData" <orderForm ref="orderForm" :mode="mode" :schoolList="schoolList" :save-obj="saveObj" :stuData="stuData"
:modityOrderType="1" @success="$emit('close')" @cancelloading="cancelloading"></orderForm> :modityOrderType="1" :defaultCourse="defaultCourse" @success="$emit('close')" @cancelloading="cancelloading"></orderForm>
</q-step> </q-step>
</q-stepper> </q-stepper>
</q-card-section> </q-card-section>
......
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
<span class="text-primary" v-if="mode === 1">班级:</span> <span class="text-primary" v-if="mode === 1">班级:</span>
<span v-if="mode === 1">{{ saveObj.ClassName }}</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 }}
<!-- <span></span> -->
<!-- <span v-else>
<span class="yueke-CourseName" v-for="(item,index) in defaultCourse">
<span>{{index+1}}</span>
{{item.CourseName}}
</span>
</span> -->
</div> </div>
<div class="row q-mb-md"> <div class="row q-mb-md">
<div class="col-10 flex"> <div class="col-10 flex">
...@@ -325,13 +332,13 @@ ...@@ -325,13 +332,13 @@
label="市场人员" label="市场人员"
/> />
<q-input <q-input
v-if="stuData.StuList[0].STTeacherId>0" v-if="OrderMsg.HelpEnterId>0"
filled filled
stack-label stack-label
disable disable
:dense="false" :dense="false"
maxlength="10" maxlength="10"
v-model="stuData.StuList[0].STTeacherName" v-model="AssistName"
class="col-6 q-py-sm" class="col-6 q-py-sm"
label="协助老师" label="协助老师"
/> />
...@@ -416,10 +423,16 @@ export default { ...@@ -416,10 +423,16 @@ export default {
schoolList: { schoolList: {
type: Array, type: Array,
default: () => [] default: () => []
},
// 已选的多选课程
defaultCourse: {
type: Array,
default: () => []
} }
}, },
data() { data() {
return { return {
AssistName:"",//协助老师名称
IsShowEditOrder: true, IsShowEditOrder: true,
OrderMsg: { OrderMsg: {
...@@ -488,12 +501,14 @@ export default { ...@@ -488,12 +501,14 @@ export default {
if (this.stuData.StuList[0].IsRenewGuest!=1){ if (this.stuData.StuList[0].IsRenewGuest!=1){
this.OrderMsg.HelpEnterId = this.stuData.StuList[0].STTeacherId; this.OrderMsg.HelpEnterId = this.stuData.StuList[0].STTeacherId;
this.AssistName = this.stuData.StuList[0].STTeacherName
} }
this.getOrderSEList(); this.getOrderSEList();
this.getEmployee(0); this.getEmployee(0);
this.getEmployee(2); this.getEmployee(2);
this.initConfig(); this.initConfig();
this.getSelectClass(); this.getSelectClass();
// console.log(this.defaultCourse,'defaultCoursedefaultCourse')
}, },
mounted() { mounted() {
this.newSchoolList = []; this.newSchoolList = [];
...@@ -517,6 +532,7 @@ export default { ...@@ -517,6 +532,7 @@ export default {
if (e.AssistType == 4) { if (e.AssistType == 4) {
if(this.stuData.StuList[0].IsRenewGuest==1){ if(this.stuData.StuList[0].IsRenewGuest==1){
this.OrderMsg.HelpEnterId = e.AssistId; this.OrderMsg.HelpEnterId = e.AssistId;
this.AssistName = e.AssistName
} }
this.HelpEnterDisable = true; this.HelpEnterDisable = true;
} }
......
...@@ -39,11 +39,21 @@ ...@@ -39,11 +39,21 @@
clearable clearable
/> />
</div> </div>
<div class="col-4">
<p class="yueke-title">已选:</p>
<p class="yueke-CourseName" v-for="(item,index) in selection">
<span>{{index+1}}</span>
{{item.CourseName}}
</p>
</div>
</div> </div>
</div> </div>
<!-- @update:selected="emitSel" single
:selected-rows-label="getSelectedString"
-->
<q-table <q-table
:pagination="msg" :pagination="msg"
selection="single" selection="multiple"
:selected.sync="selection" :selected.sync="selection"
no-data-label="暂无相关数据" no-data-label="暂无相关数据"
flat flat
...@@ -53,6 +63,7 @@ ...@@ -53,6 +63,7 @@
:columns="columns" :columns="columns"
row-key="ClassId" row-key="ClassId"
@update:selected="emitSel" @update:selected="emitSel"
:selected-rows-label="getSelectedString"
table-class="table" table-class="table"
> >
<template v-slot:body-cell-CourseName="props"> <template v-slot:body-cell-CourseName="props">
...@@ -174,6 +185,10 @@ export default { ...@@ -174,6 +185,10 @@ export default {
// this.getCategorytree(); // this.getCategorytree();
}, },
methods: { methods: {
// 多选
getSelectedString () {
return this.selection.length === 0 ? '' : `${this.selection.length} record${this.selection.length > 1 ? 's' : ''} selected of ${this.dataList.length}`
},
emitSel(val) { emitSel(val) {
this.$emit("select", val); this.$emit("select", val);
}, },
...@@ -267,4 +282,19 @@ export default { ...@@ -267,4 +282,19 @@ export default {
.table::-webkit-scrollbar-corner { .table::-webkit-scrollbar-corner {
background: #204754; background: #204754;
} }
.yueke-title{
margin-top: 0;
margin-bottom: 0;
}
.yueke-CourseName{
margin-right: 5px;
white-space:nowrap;
overflow: hidden;
text-overflow:ellipsis;
margin-top: 5px;
margin-bottom: 0;
}
.yueke-CourseName span{
color: #2961fe;
}
</style> </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