Skip to content

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

页面调整

parent 26c19f2b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 351 additions and 517 deletions
src/components/global/user-right-box.vue
View file @ 27690f81
This diff is collapsed.
src/components/sale/orderlist.vue
View file @ 27690f81
......@@ -31,7 +31,7 @@
</td>
</tr>
<template v-for="(item, index) in dataList">
<tr>
<tr :key="`r_d_1_`+index">
<td :rowspan="3" style="text-align: left">
<div>
<span @click="goOrderdetails(item, 1)" class="order_OfferId">{{
......@@ -104,7 +104,6 @@
<div>{{ item.CreateByName }}</div>
<!-- <div>课程顾问：{{ item.ConsultantName||'无' }}</div> -->
<div>市场专员：{{ item.EnterName ||'无' }}</div>
<div style="margin-top: 10px">{{ item.CreateTime }}</div>
<template v-if="AuthorityObj.isShowName">
<div style="font-weight: bold;color:#2961FE;cursor:pointer;" @click="getClassInfo(item)">
......@@ -130,9 +129,10 @@
<template v-if="item.OrderType == 1">
<div v-if="item.ClassList&&item.ClassList.length>0">
课程名称：
<span v-for="(itemc, indexc) in item.ClassList">{{indexc>0?'、':""}}{{itemc.CourseName }}</span>
<span v-for="(itemc, indexc) in item.ClassList"
:key="`c_`+indexc">{{indexc>0?'、':""}}{{itemc.CourseName }}</span>
</div>
<div v-else="item.CourseName">
<div v-else>
课程名称：{{ item.CourseName }}
</div>
<div v-if="item.CourseSubjectName">
......@@ -190,7 +190,7 @@
<td style="border:none;">
<template v-if="item.Class_Price >= 0">
{{ item.Class_Price.toFixed(2) }}
</br>
<br />
<template v-if="studyOrderType!=1">
({{item.SellPriceType==2?'课时单价':'课时总价'}})</template>
</template>
......@@ -206,10 +206,7 @@
</template>
</td>
<td style="border:none;" v-if="studyOrderType!=1">
{{ item.TotalClassHours }}
</td>
<td :style="{
color:
......@@ -449,11 +446,11 @@
</q-btn-dropdown>
</td>
</tr>
<tr>
<tr :key="`r_d_2_`+index">
<td :colspan="studyOrderType!=1?17:14" style="text-align: left">
<div class="row" v-if="item.GuestList && item.GuestList.length > 0">
学生名单：
<template v-for="(x, j) in item.GuestList" :index="j">
<template v-for="(x, j) in item.GuestList">
<span v-if="x.GuestState == 1" style="color:#2961FE;margin-right: 5px" :key="j">{{ x.GuestName }}
</span>
<span v-else style="color:red;margin-right: 5px" :key="j">
......@@ -521,7 +518,7 @@
<span v-if="item.GuestList && item.GuestList.length == 0">暂无</span>
</td>
</tr>
<tr>
<tr :key="`r_d_3_`+index">
<td :colspan="studyOrderType!=1?17:14" style="height: 168px;text-align: left">
<div class="col row remarks q-gutter-x-md">
<div class="col">
......@@ -556,15 +553,11 @@
<div class="col">
<div>教务备注：</div>
<div class="remarks-b ">
<div v-if="
item.TeacherRemark != null || item.TeacherRemark != ''
">
<div v-if="item.TeacherRemark != null || item.TeacherRemark != ''">
<div>{{ item.TeacherRemark }}</div>
<div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="
item.TeacherRemarkList &&
item.TeacherRemarkList.length > 0
"></span>
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length > 0 "></span>
<q-popup-proxy>
<q-banner>
<div style="width: 500px;">
......@@ -581,9 +574,7 @@
</q-popup-proxy>
</div>
</div>
<span v-if="
item.TeacherRemark == null || item.TeacherRemark == ''
">暂无</span>
<span v-if="item.TeacherRemark == null || item.TeacherRemark == ''">暂无</span>
</div>
</div>
<div class="col">
......
src/layouts/MainLayout.vue
View file @ 27690f81
......@@ -113,7 +113,7 @@
</q-item-section>
<q-item-section>{{ x.MenuName }}</q-item-section>
</q-item>
<q-expansion-item v-else :label="x.MenuName">
<q-expansion-item v-else :label="x.MenuName" :key="`s_`+i">
<template v-for="(y, yi) in x.SubList">
<q-item :to="y.MenuUrl" clickable v-ripple :active="currentPath == y.MenuUrl" :key="yi"
class="q-ml-md" v-if="!y.SubList || y.SubList.length == 0">
......@@ -122,7 +122,7 @@
</q-item-section>
<q-item-section>{{ y.MenuName }}</q-item-section>
</q-item>
<q-expansion-item v-else :label="y.MenuName" class="q-ml-md">
<q-expansion-item v-else :label="y.MenuName" class="q-ml-md" :key="`s_`+i+`_t_`+yi">
<q-item :to="z.MenuUrl" clickable v-ripple :active="currentPath == z.MenuUrl" :key="zi"
v-for="(z, zi) in y.SubList" class="q-ml-md">
<q-item-section avatar style="padding-right: 0; min-width: 30px">
......@@ -238,9 +238,7 @@
this.secondNavs =
newVal.MenuList.length > 0 ?
newVal.MenuList[i] && newVal.MenuList[i].SubList ?
newVal.MenuList[i].SubList :
[] :
[];
newVal.MenuList[i].SubList : [] : [];
}
if (newVal && newVal.UserCenterList) {
this.userCenterMenuList = newVal.UserCenterList;
......@@ -262,9 +260,7 @@
this.secondNavs =
this.userInfo.MenuList.length > 0 ?
this.userInfo.MenuList[i] && this.userInfo.MenuList[i].SubList ?
this.userInfo.MenuList[i].SubList :
[] :
[];
this.userInfo.MenuList[i].SubList : [] : [];
}
this.$root.$on("goworkobj", data => {
this.secondNavs = [];
......
src/pages/h5page/components/audition.vue
View file @ 27690f81
<style lang="scss" scoped>
::v-deep .el-input__inner{
background-color: rgba(25,25,25,0);
::v-deep .el-input__inner {
background-color: rgba(25, 25, 25, 0);
border: 0;
}
}
</style>
<template>
<div :class="[$q.platform.is.mobile?'q-pa-md bg-grey-1':'']"
:style="{'height':$q.platform.is.mobile?'100vh':''}">
<div :class="[$q.platform.is.mobile?'q-pa-md bg-grey-1':'']" :style="{'height':$q.platform.is.mobile?'100vh':''}">
<p class="text-center small text-weight-bold text-h6" v-if="type">试听开课</p>
<div class="row wrap">
<div style="width:100%;margin-bottom:15px;">试听时间：<span style="color:red;">{{timeFormatSeconds(setClassMsg.ReservationDate)}}</span></div>
<div style="width:100%;margin-bottom:15px;">试听需求：<span style="color:red;">{{setClassMsg.Demand}}</span></div>
<div style="width:100%;margin-bottom:15px;">试听时间：<span
style="color:red;">{{timeFormatSeconds(setClassMsg.ReservationDate)}}</span></div>
<div style="width:100%;margin-bottom:15px;">试听需求：<font style="color:red;" v-html="setClassMsg.Demand"></font></div>
</div>
<q-card class="bg-white q-pa-md" flat>
<div class="row studentDate">
<q-field filled dense
:class="[$q.platform.is.mobile?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']">
<q-field filled dense :class="[$q.platform.is.mobile?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']">
<template v-slot:control>
<el-date-picker v-model="setClassMsg.ClassDate" ref="ClassDate" :rules="[val => !!val || '请选择预约日期']"
style="width:100%" size="mini" type="date" placeholder="预约日期" value-format="yyyy-MM-dd">
</el-date-picker>
</template>
</q-field>
<div class="Student_Date "
:class="[$q.platform.is.mobile?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']">
<div class="Student_Date " :class="[$q.platform.is.mobile?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']">
<q-field filled class="" dense>
<template v-slot:control>
<el-time-select v-model="setClassMsg.ClassTime" size="mini" ref="ClassTime" style="width:50%;" :picker-options="{
<el-time-select v-model="setClassMsg.ClassTime" size="mini" ref="ClassTime" style="width:50%;"
:picker-options="{
start: '09:00',
step: '00:15',
end: '21:00',
......@@ -49,14 +49,12 @@
<div class="row wrap">
<q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="setClassMsg.TeacherId"
ref="TeacherId" :options="TeacherList" label="选择教师" dense class="col-6"
:class="[$q.platform.is.mobile?'q-pr-sm q-pb-sm':'q-pr-lg q-pb-lg']"emit-value
map-options />
<q-select filled stack-label option-value="RoomId" dense option-label="RoomName" v-model="setClassMsg.ClassRoomId"
ref="ClassRoomId" :options="ClassRoomList" label="关联教室" class="col-6"
:class="[$q.platform.is.mobile?'q-pl-sm q-pb-sm':'q-pr-lg q-pb-lg']" emit-value
map-options />
<q-select filled stack-label option-value="Id" dense option-label="LessonName" v-model="setClassMsg.TrialLessonId"
:options="TrialList" label="试听课程" class="col-6"
:class="[$q.platform.is.mobile?'q-pr-sm q-pb-sm':'q-pr-lg q-pb-lg']" emit-value map-options />
<q-select filled stack-label option-value="RoomId" dense option-label="RoomName"
v-model="setClassMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室" class="col-6"
:class="[$q.platform.is.mobile?'q-pl-sm q-pb-sm':'q-pr-lg q-pb-lg']" emit-value map-options />
<q-select filled stack-label option-value="Id" dense option-label="LessonName"
v-model="setClassMsg.TrialLessonId" :options="TrialList" label="试听课程" class="col-6"
:class="[$q.platform.is.mobile?'q-pr-sm':'q-pr-lg q-pb-lg']" emit-value map-options />
</div>
</q-card>
......@@ -64,8 +62,8 @@
<div slot="footer" class="dialog-footer"
:class="[$q.platform.is.mobile?'text-center q-pt-lg row':'text-right q-pb-lg']">
<el-button v-if="!$q.platform.is.mobile" @click="closeShitingKaiKe()">取 消</el-button>
<el-button type="primary" @click="SetVisitorReserveClass()"
:class="[$q.platform.is.mobile?'col-12':'']">{{type?'保 存':'确 定'}}</el-button>
<el-button type="primary" @click="SetVisitorReserveClass()" :class="[$q.platform.is.mobile?'col-12':'']">
{{type?'保 存':'确 定'}}</el-button>
</div>
<statusPrompt v-if="isSuccess" :isSuccess="isSuccess" :isSuccessTitle="isSuccessTitle"></statusPrompt>
</div>
......@@ -87,7 +85,7 @@
} from "../../../api/school/index";
import statusPrompt from "./statusPrompt";
export default {
props: ['VisitorReserveClassMsg','type'],
props: ['VisitorReserveClassMsg', 'type'],
components: {
statusPrompt
},
......@@ -97,26 +95,26 @@
TeacherList: [],
ClassRoomList: [],
TrialList: [],
setClassMsg:{
Id:0,
Visitor_Id:0,
Remark:"",
ReserveClassId:0,
ClassDate:"",
ReservationDate:"",
ClassTime:"",
TeacherId:0,
ClassRoomId:0,
ClassContent:"",
EndTime:"",
TrialLessonId:0,
ReserveType:0,
ClassPlanId:0,
Demand:"",
setClassMsg: {
Id: 0,
Visitor_Id: 0,
Remark: "",
ReserveClassId: 0,
ClassDate: "",
ReservationDate: "",
ClassTime: "",
TeacherId: 0,
ClassRoomId: 0,
ClassContent: "",
EndTime: "",
TrialLessonId: 0,
ReserveType: 0,
ClassPlanId: 0,
Demand: "",
},
isSuccess: false,
isSuccessTitle: '',
Id:0,
Id: 0,
}
},
watch: {
......@@ -152,7 +150,7 @@
},
computed: {},
mounted() {
if(this.$route.query.Id){
if (this.$route.query.Id) {
this.Id = this.$route.query.Id
this.GetVisitorReserve()
}
......@@ -219,10 +217,10 @@
}
SetVisitorReserveClass(this.setClassMsg).then(res => {
if (res.Code == 1) {
if(this.type){
if (this.type) {
this.isSuccess = true
this.isSuccessTitle = '试听课开课成功！'
}else{
} else {
this.$q.notify({
icon: "iconfont icon-chenggong",
color: "accent",
......@@ -244,29 +242,29 @@
});
},
closeShitingKaiKe(){
closeShitingKaiKe() {
this.setClassMsg = {
Id:0,
Visitor_Id:0,
Remark:"",
ReserveClassId:0,
ClassDate:"",
ReservationDate:"",
ClassTime:"",
TeacherId:0,
ClassRoomId:0,
ClassContent:"",
EndTime:"",
TrialLessonId:0,
ReserveType:0,
ClassPlanId:0,
Demand:"",
Id: 0,
Visitor_Id: 0,
Remark: "",
ReserveClassId: 0,
ClassDate: "",
ReservationDate: "",
ClassTime: "",
TeacherId: 0,
ClassRoomId: 0,
ClassContent: "",
EndTime: "",
TrialLessonId: 0,
ReserveType: 0,
ClassPlanId: 0,
Demand: "",
}
this.$emit('close')
},
timeFormatSeconds(time,type) {
let timeStr="";
if(time==='0001-01-01T00:00:00'){
timeFormatSeconds(time, type) {
let timeStr = "";
if (time === '0001-01-01T00:00:00') {
return timeStr;
}
var d = time ? new Date(time) : new Date();
......@@ -275,17 +273,17 @@
var day = d.getDate();
if (month < 10) month = '0' + month;
if (day < 10) day = '0' + day;
if(type==2){
if (type == 2) {
var hours = d.getHours();
var min = d.getMinutes();
var seconds = d.getSeconds();
if (hours < 0) hours = '0' + hours;
if (min < 10) min = '0' + min;
if (seconds < 10) seconds = '0' + seconds;
timeStr+= ' ' + hours + ':' + min + ':' + seconds;
timeStr += ' ' + hours + ':' + min + ':' + seconds;
}
timeStr=year + '-' + month + '-' + day +timeStr;
timeStr = year + '-' + month + '-' + day + timeStr;
return timeStr;
},
//试听课程列表
......@@ -328,7 +326,7 @@
GetVisitorReserveById({
Id: this.Id
}).then(res => {
if(res.Data.length>0){
if (res.Data.length > 0) {
let Data = res.Data[0]
this.setClassMsg = {
Id: Data.Id, //编号
......
src/pages/sale/reserveClassStudent.vue
View file @ 27690f81
......@@ -3,15 +3,13 @@
background: transparent !important;
border: 0 !important;
}
</style>
<template>
<div class="page-body">
<div class="page-search"
:class="[$q.platform.is.desktop?'row items-center':'']">
<div class="col row wrap q-col-gutter-md"
:class="[$q.platform.is.desktop?'q-mr-lg':'']">
<div
:class="[$q.platform.is.desktop?'col-3':'col-12']">
<div class="page-search" :class="[$q.platform.is.desktop?'row items-center':'']">
<div class="col row wrap q-col-gutter-md" :class="[$q.platform.is.desktop?'q-mr-lg':'']">
<div :class="[$q.platform.is.desktop?'col-3':'col-12']">
<div class="Sysuser_Date">
<q-field filled>
<template v-slot:control>
......@@ -25,36 +23,12 @@
</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 />
</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 />
</div>
<div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.LessonName" label="试听课程名称" @clear="resetSearch"
maxlength="20" />
</div> -->
</div>
</div>
<reservelist :data="dataList" :authObj="authObj" :loading="loading" @success="refreshPage"></reservelist>
<q-card
class="light-shadow q-pa-md bg-white rounded-borders q-mb-md"
v-if="msg.pageCount > 0"
flat
>
<q-pagination v-if="$q.platform.is.mobile"
class="full-width justify-end"
v-model="msg.pageIndex"
color="primary"
:max="msg.pageCount"
:input="true"
@update:model-value="changePageHandler"
/>
<q-card class="light-shadow q-pa-md bg-white rounded-borders q-mb-md" v-if="msg.pageCount > 0" flat>
<q-pagination v-if="$q.platform.is.mobile" class="full-width justify-end" v-model="msg.pageIndex" color="primary"
:max="msg.pageCount" :input="true" @update:model-value="changePageHandler" />
</q-card>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" :input="true"
@input="changePage" />
......@@ -71,7 +45,7 @@
import reservelist from '../../components/schedul/reservestudentlist'
export default {
meta: {
title: "试听班级管理"
title: "试听开课管理"
},
components: {
reservelist
......@@ -88,8 +62,8 @@
ClassRoomId: "", //教室编号
LessonName: '', //课程名称
Visitor_Id: 0,
IsReserve:1,
IsQNotReserveClassId:1,
IsReserve: 1,
IsQNotReserveClassId: 1,
},
dataList: [],
loading: false,
......@@ -172,7 +146,9 @@
},
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
src/utils/erpindex.js
View file @ 27690f81
......@@ -80,12 +80,9 @@ export default {
},
//域名管理对象
Vue.prototype.domainManager = function () {
//let domainUrl = 'http://192.168.10.214';
let domainUrl = 'http://192.168.5.57';
let viewFileUrl = 'http://192.168.5.214:8120';
let mallUrl = "http://192.168.5.2:8088";
let mallUrl = "http://192.168.5.46:8200";
let vtUploadUrl = "http://upload.oytour.com";
let vtViewUrl = "http://192.168.5.214:8130";
let locationName = window.location.hostname;
......
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