Skip to content

C
confucius
Commit 27bb5c1d authored by youjie's avatar youjie
Browse files
Options

no message

parents 49db80f2 27690f81
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 361 additions and 518 deletions
src/components/global/user-right-box.vue
View file @ 27bb5c1d
This diff is collapsed.
src/components/sale/orderlist.vue
View file @ 27bb5c1d
......@@ -6,32 +6,32 @@
<div class="table-body" v-loading="loading">
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<tr class="fix_th">
<th width="12%">单号</th>
<th width="6%">人数</th>
<th width="6%">单价</th>
<th width="6%" v-if="studyOrderType!=1">教材费</th>
<th width="6%" v-if="studyOrderType!=1">课件费</th>
<th width="6%" v-if="studyOrderType!=1">总课时</th>
<th width="6%">成交</th>
<th width="6%">应收总额</th>
<th width="6%">实收</th>
<th width="6%">优惠</th>
<th width="6%">少价金额</th>
<th width="6%">退款</th>
<th width="6%">平台税金</th>
<th width="6%">待收金额</th>
<template v-if="AuthorityObj.isShowStudyRebate">
<th width="6%">留学订单回佣</th>
</template>
<th width="6%">状态</th>
<th v-if="viewType == 0">操作</th>
<th width="12%">单号</th>
<th width="6%">人数</th>
<th width="6%">单价</th>
<th width="6%" v-if="studyOrderType!=1">教材费</th>
<th width="6%" v-if="studyOrderType!=1">课件费</th>
<th width="6%" v-if="studyOrderType!=1">总课时</th>
<th width="6%">成交</th>
<th width="6%">应收总额</th>
<th width="6%">实收</th>
<th width="6%">优惠</th>
<th width="6%">少价金额</th>
<th width="6%">退款</th>
<th width="6%">平台税金</th>
<th width="6%">待收金额</th>
<template v-if="AuthorityObj.isShowStudyRebate">
<th width="6%">留学订单回佣</th>
</template>
<th width="6%">状态</th>
<th v-if="viewType == 0">操作</th>
<tr>
<td v-show="dataList && dataList.length == 0" :colspan="17" align="center">
暂无数据
</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">
......@@ -189,10 +189,10 @@
<td style="border:none;">{{ item.GuestNum }}人</td>
<td style="border:none;">
<template v-if="item.Class_Price >= 0">
{{ item.Class_Price.toFixed(2) }}
</br>
<template v-if="studyOrderType!=1">
({{item.SellPriceType==2?'课时单价':'课时总价'}})</template>
{{ item.Class_Price.toFixed(2) }}
<br />
<template v-if="studyOrderType!=1">
({{item.SellPriceType==2?'课时单价':'课时总价'}})</template>
</template>
</td>
<td style="border:none;" v-if="studyOrderType!=1">
......@@ -206,10 +206,7 @@
</template>
</td>
<td style="border:none;" v-if="studyOrderType!=1">
{{ item.TotalClassHours }}
{{ 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">
......@@ -912,16 +903,16 @@
{{ item.TextbookFee.toFixed(2) }}
</template>
</td>
<td style="border:none;" v-if="studyOrderType!=1">
<template v-if="item.CoursewareFee >= 0">
{{ item.CoursewareFee.toFixed(2) }}
</template>
</td>
<td style="border:none;" v-if="studyOrderType!=1">
<td style="border:none;" v-if="studyOrderType!=1">
<template v-if="item.CoursewareFee >= 0">
{{ item.CoursewareFee.toFixed(2) }}
</template>
</td>
<td style="border:none;" v-if="studyOrderType!=1">
{{ item.TotalClassHours }}
</td>
</td>
<td :style="{
<td :style="{
color:
item.Class_Price != item.Unit_Price
? 'var(--q-color-negative)'
......
src/components/schedul/reserve-form.vue
View file @ 27bb5c1d
......@@ -10,6 +10,11 @@
<div class="text-h6">{{objOption.Id==0?'新增试听课程':'修改试听课程'}}</div>
</q-card-section>
<q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<p ><span>试听时间：</span><span style="color:red;">{{timeFormatSeconds(objOption.ReservationDate)}}</span></p>
<q-space />
<p><span style="float:left;">试听需求：</span><div v-html="objOption.Demand" style="color:red;"></div></p>
<q-space />
<div class="row wrap">
<q-input filled v-model="objOption.ClassDate" class=""
:class="[$q.platform.is.desktop?'col-6 q-pr-lg q-pb-lg':'col-12 q-pb-sm']"
......@@ -104,6 +109,8 @@
TrialLessonId: '',
Visitor_Id:0,
Id:0,
ReservationDate:"",
Demand:"",
},
saveLoading: false,
TeacherList: [],
......@@ -171,6 +178,8 @@
this.objOption.ClassRoomId = res.Data[0].ClassRoomId;
this.objOption.TrialLessonId = res.Data[0].TrialLessonId;
this.objOption.Visitor_Id = res.Data[0].Visitor_Id;
this.objOption.ReservationDate = res.Data[0].ReservationDate;
this.objOption.Demand = res.Data[0].Demand;
if(this.objOption.TrialLessonId==0){
this.objOption.ClassDate = this.timeFormatSeconds(res.Data[0].ReservationDate);
}
......
src/layouts/MainLayout.vue
View file @ 27bb5c1d
......@@ -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 @ 27bb5c1d
This diff is collapsed.
src/pages/sale/reserveClassStudent.vue
View file @ 27bb5c1d
......@@ -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,37 +23,13 @@
</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="resetSearch"></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>
<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>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" :input="true"
@input="changePage" />
</div>
......@@ -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,
......@@ -106,7 +80,7 @@
var year = nowDay.getFullYear(); //年
var month = nowDay.getMonth() + 1; //月
var day = nowDay.getDate(); //日
this.msg.StartClassDate = year + '-' + month + '-' + day
this.msg.StartClassDate = year + '-' + month + '-' + day
if (this.$route.query) {
if (this.$route.query.StartClassDate) {
......@@ -172,7 +146,9 @@
},
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
src/utils/erpindex.js
View file @ 27bb5c1d
......@@ -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