Skip to content

C
confucius
Commit ad06b6b9 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 289e501d
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 57 deletions
src/components/sale/editOrder-form.vue
View file @ ad06b6b9
......@@ -31,8 +31,8 @@
<q-input filled stack-label :dense="false" v-model="OrderMsg.StartClassHours" :disable="modityOrderType==2"
@keyup.native="checkInteger(OrderMsg,'StartClassHours')" ref="StartClassHours" @input="countPrice"
class="col-12 q-pb-lg" label="起始课时" />
<q-input filled v-model="OrderMsg.EffectTime" ref="EffectTime" :rules="[val => !!val || '请填生效时间']" class="col-6 q-pb-lg"
:disable="modityOrderType==2" mask="date" label="生效时间">
<q-input filled v-model="OrderMsg.EffectTime" ref="EffectTime" :rules="[val => !!val || '请填生效时间']"
class="col-6 q-pb-lg" :disable="modityOrderType==2" mask="date" label="生效时间">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy1" transition-show="scale" transition-hide="scale">
......@@ -41,12 +41,14 @@
</q-icon>
</template>
</q-input>
<q-select filled option-value="OrderId" option-label="CourseName" class="q-pb-lg" :disable="modityOrderType==2"
v-model="OrderMsg.UpOrderId" :options="beforeOrderList" emit-value map-options label="前置订单">
<q-select filled option-value="OrderId" option-label="CourseName" class="q-pb-lg"
:disable="modityOrderType==2" v-model="OrderMsg.UpOrderId" :options="beforeOrderList" emit-value map-options
label="前置订单">
<template v-slot:option="{ itemProps, itemEvents, opt, selected, toggleOption }">
<q-item v-bind="itemProps" v-on="itemEvents">
<q-item-section>
<q-item-label><span style="color:blue">{{opt.OrderId}}</span> {{opt.CourseName}} {{opt.ClassName}} {{getStudent(opt.GuestList)}}</q-item-label>
<q-item-label><span style="color:blue">{{opt.OrderId}}</span> {{opt.CourseName}} {{opt.ClassName}}
{{getStudent(opt.GuestList)}}</q-item-label>
</q-item-section>
</q-item>
</template>
......@@ -73,7 +75,7 @@
v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
label="客人来源" />
<q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled
use-input label="协助人员" option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg"
use-input label="协助老师" option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg"
emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
......@@ -158,7 +160,7 @@
OrderId: 0,
OrderType: 0, //订单类型(1-班级课程订单，2-留学就业订单)
SourceId: 0, //来源编号
HelpEnterId: 0, //协助人员编号
HelpEnterId: 0, //协助老师编号
GeneralOccupation: "", //一般同行
EduOccupation: "", //教育同行
IsLessPrice: 0, //是否少价 0 不少 1 少
......@@ -260,8 +262,16 @@
}
}
} else {
this.OrderMsg.Unit_Price = 0;
this.UnitPrice = 0;
if (this.saveObj.ClassId) {
this.OrderMsg.ClassId = this.saveObj.ClassId;
}
if (this.saveObj.Unit_Price) {
this.OrderMsg.Unit_Price = this.saveObj.Unit_Price;
this.UnitPrice = this.saveObj.Unit_Price;
}
if (this.saveObj.SourceId) {
this.OrderMsg.SourceId = this.saveObj.SourceId;
}
this.courseObj = {};
}
this.countPrice();
......@@ -459,13 +469,13 @@
}
})
},
getStudent(item){
getStudent(item) {
let str = ''
if(item&&item.length>1){
str=item[0].GuestName+'等'+item.length+'人';
if (item && item.length > 1) {
str = item[0].GuestName + '等' + item.length + '人';
}
if(item.length==1){
str=item[0].GuestName;
if (item.length == 1) {
str = item[0].GuestName;
}
return str
}
......
src/components/sale/studyOrder-form.vue
View file @ ad06b6b9
......@@ -86,7 +86,7 @@
OrderId: 0,
OrderType: 0, //订单类型(1-班级课程订单，2-留学就业订单)
SourceId: 0, //来源编号
HelpEnterId: 0, //协助人员编号
HelpEnterId: 0, //协助老师编号
GeneralOccupation: "", //一般同行
EduOccupation: "", //教育同行
IsLessPrice: 0, //是否少价 0 不少 1 少
......
src/components/schedul/audition-form.vue
View file @ ad06b6b9
......@@ -7,29 +7,24 @@
<q-card-section>
<div class="row wrap">
<div class="col-6 q-pb-lg q-pr-lg">
<q-field borderless @input="resetSearch">
<q-field borderless>
 <template v-slot:prepend>
<q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期" @input="resetSearch"
@change="resetSearch">
<q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="StartClassDate" transition-show="scale" transition-hide="scale">
<q-date v-model="msg.StartClassDate" @input="gettime()"
@change="resetSearch" />
<q-date v-model="msg.StartClassDate" @input="getStarttime()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</template>
<template v-slot:append>
<q-input filled v-model="msg.EndClassDate" mask="date" label="结束日期" @input="resetSearch"
@change="resetSearch">
<q-input filled v-model="msg.EndClassDate" mask="date" label="结束日期">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="EndClassDate" transition-show="scale" transition-hide="scale">
<q-date v-model="msg.EndClassDate" @input="() => $refs.EndClassDate.hide()"
@change="resetSearch" />
<q-date v-model="msg.EndClassDate" @input="getEndTime()" />
</q-popup-proxy>
</q-icon>
</template>
......@@ -70,7 +65,7 @@
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
<q-btn label="关闭" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
</q-card-actions>
</q-card>
</q-dialog>
......@@ -149,8 +144,12 @@
this.GetTeacherList();
},
mounted() {
var day = new Date();
this.msg.StartClassDate = day.getFullYear() + "-" + (day.getMonth() + 1) + "-" + day.getDate();
let nowDay = new Date();
var year = nowDay.getFullYear(); //年
var month = nowDay.getMonth() + 1; //月
var day = nowDay.getDate(); //日
var currentDay= year + '-' + (month<10?('0'+month):month) + '-' + day;
this.msg.StartClassDate = currentDay;
this.getList();
},
methods: {
......@@ -198,20 +197,19 @@
this.$emit('getchildInfo', this.StuObj);
this.closeSaveForm();
},
gettime(){
this.$refs.StartClassDate.hide()
console.log('1212')
getStarttime() {
this.$refs.StartClassDate.hide();
this.resetSearch();
},
getEndTime()
{
this.$refs.EndClassDate.hide();
this.resetSearch();
}
},
}
</script>
<style>
<style>.Sysuser_Date .el-input__inner {
background: transparent !important;
border: 0 !important;
}
</style>
</style>
src/components/schedul/exorder-form.vue
View file @ ad06b6b9
......@@ -43,7 +43,7 @@
v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
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-pb-lg"
use-input label="协助老师" option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg"
emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
......@@ -119,7 +119,7 @@
OrderId: 0,
OrderType: 1, //订单类型(1-班级课程订单，2-留学就业订单)
SourceId: 0, //来源编号
HelpEnterId: 0, //协助人员编号
HelpEnterId: 0, //协助老师编号
GeneralOccupation: "", //一般同行
EduOccupation: "", //教育同行
IsLessPrice: 0, //是否少价 0 不少 1 少
......
src/pages/sale/reserveClass.vue
View file @ ad06b6b9
......@@ -3,6 +3,7 @@
background: transparent !important;
border: 0 !important;
}
</style>
<template>
<div class="page-body">
......@@ -12,29 +13,30 @@
<div class="col-4 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间" size="small"
style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
<el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>至
<el-date-picker v-model="msg.EndClassDate" value-format="yyyy-MM-dd" type="date" placeholder="结束时间" size="small"
style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
<el-date-picker v-model="msg.EndClassDate" value-format="yyyy-MM-dd" type="date" placeholder="结束时间"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>
</template>
</q-field>
</div>
</div>
<div class="col-3">
<q-select @input="resetSearch" filled option-value="TId" option-label="TeacherName"
v-model="msg.TeacherId" :options="TeacherList" emit-value map-options label="老师" clearable />
<q-select @input="resetSearch" filled option-value="TId" option-label="TeacherName" v-model="msg.TeacherId"
:options="TeacherList" emit-value map-options label="老师" clearable />
</div>
<div class="col-3">
<q-select @input="resetSearch" filled stack-label option-value="RoomId" option-label="RoomName" v-model="msg.ClassRoomId"
ref="ClassRoomId" :options="ClassRoomList" label="关联教室" clearable :dense="false" class="col-6 q-pb-lg" emit-value
map-options />
<q-select @input="resetSearch" filled stack-label option-value="RoomId" option-label="RoomName"
v-model="msg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室" clearable :dense="false"
class="col-6 q-pb-lg" emit-value map-options />
</div>
</div>
</div>
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
separator="none" :data="dataList" :columns="columns" row-key="name">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">试听课管理</div>
<q-space />
......@@ -49,10 +51,27 @@
</div>
</q-td>
</template>
<template v-slot:body-cell-JoinNum="props">
<q-td auto-width :props="props" style="width:25%">
<span style="color:red;" :class="{'underLine':(props.row.VisitorList&&props.row.VisitorList.length>0)}">
{{props.row.JoinNum}}
<q-popup-proxy v-if="props.row.VisitorList&&props.row.VisitorList.length>0">
<div style="min-width:360px;max-width:360px;">
<q-banner>
<q-chip dense v-for="(subItem,subindex) in props.row.VisitorList" :key="subindex">
{{subItem.VisitorName}}</q-chip>
</q-banner>
</div>
</q-popup-proxy>
</span>
</q-td>
</template>
<template v-slot:body-cell-TeacherId="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" @click="editVisitor(props.row)" style="font-weight:400" label="修改" />
<q-btn flat size="xs" icon="delete" @click="deleteReserve(props.row)" color="negative" style="font-weight:400" label="删除" />
<q-btn flat size="xs" icon="edit" color="accent" @click="editVisitor(props.row)" style="font-weight:400"
label="修改" />
<q-btn flat size="xs" icon="delete" @click="deleteReserve(props.row)" color="negative" style="font-weight:400"
label="删除" />
</q-td>
</template>
<template v-slot:bottom>
......@@ -60,7 +79,8 @@
:input="true" @input="changePage" />
</template>
</q-table>
<reserveForm v-if="isShowReserve" :save-obj="reserveObj" @close="closeReserveForm" @success="refreshPage"></reserveForm>
<reserveForm v-if="isShowReserve" :save-obj="reserveObj" @close="closeReserveForm" @success="refreshPage">
</reserveForm>
</div>
</template>
......@@ -153,7 +173,7 @@
],
TeacherList: [],
ClassRoomList: [],
isShowReserve:false,
isShowReserve: false,
reserveObj: {}
}
},
......@@ -204,7 +224,7 @@
})
},
//编辑试听
editVisitor(obj){
editVisitor(obj) {
if (obj) {
this.reserveObj = obj
} else {
......@@ -213,7 +233,7 @@
this.isShowReserve = true;
},
//删除试听课
deleteReserve(item){
deleteReserve(item) {
let delMsg = {
ReserveClassId: item.ReserveClassId,
};
......
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