Skip to content

C
confucius
Commit 675e4201 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 0914be20 a6e5b147
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4530 additions and 3608 deletions
quasar.conf.js
View file @ 675e4201
......@@ -48,9 +48,9 @@ module.exports = function(ctx) {
env: ctx.dev ? {
//API: 'http://localhost:5001/api',
API: 'http://192.168.10.46:8300/api',
API: 'http://192.168.10.2:8085/api',
// API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://192.168.10.17:8087/api',
API_ZC: 'http://192.168.10.2:8087/api',
API_SK: 'ws:192.168.10.214:',
API_SIG: 'http://localhost:5001/messagecenter'
} : {
......
src/api/studentmsg/index.js
View file @ 675e4201
......@@ -46,3 +46,14 @@ export function removeActivitySurveyGuest(data) {
data
})
}
/*
* 获取学员编号
*/
export function getAccountStudentList(data) {
return request({
url: '/User/GetAccountStudentList',
method: 'post',
data
})
}
\ No newline at end of file
src/components/activity/student-from.vue
View file @ 675e4201
This diff is collapsed.
src/components/course/course-form.vue
View file @ 675e4201
......@@ -83,13 +83,13 @@
<div class="row wrap">
<div class="col-6">
<q-input filled stack-label :disable="!isHaveCourseHoursEdit"
@keyup.native="checkPrice(objOption, 'ClassHours')" reverse-fill-mask v-model="objOption.ClassHours"
ref="ClassHours" class="col-6 q-pr-lg q-pb-lg" label="课时数量" :rules="[val => !!val || '请填写课时信息']" />
@keyup.native="checkPrice(objOption, 'ChineseHours')" reverse-fill-mask v-model="objOption.ChineseHours"
ref="ChineseHours" class="col-6 q-pr-lg q-pb-lg" label="中教课时" />
</div>
<div class="col-6">
<q-select filled stack-label @input="changeCourseSubject(objOption.CateId)" option-value="CateId"
option-label="CateName" v-model="objOption.CateId" ref="CateId" :options="TreeCategoryList" label="所属系列"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options :rules="[val => !!val || '请选择课程所属系列']" />
<q-input filled stack-label :disable="!isHaveCourseHoursEdit"
@keyup.native="checkPrice(objOption, 'ForeignHours')" reverse-fill-mask v-model="objOption.ForeignHours"
ref="ForeignHours" class="col-6 q-pr-lg q-pb-lg" label="外教课时" />
</div>
</div>
<div class="row wrap">
......@@ -99,13 +99,18 @@
class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
</div>
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.CourseRate"
ref="CourseRate" :options="courseLevelList" label="课程等级" class="col-6 q-pr-lg q-pb-lg" emit-value
map-options />
<q-select filled stack-label @input="changeCourseSubject(objOption.CateId)" option-value="CateId"
option-label="CateName" v-model="objOption.CateId" ref="CateId" :options="TreeCategoryList" label="所属系列"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options :rules="[val => !!val || '请选择课程所属系列']" />
</div>
</div>
<div class="row">
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.CourseRate"
ref="CourseRate" :options="courseLevelList" label="课程等级" class="col-6 q-pr-lg q-pb-lg" emit-value
map-options />
</div>
<q-field label="是否支持约课报名" stack-label filled class="col-6 q-pr-lg q-pb-lg">
<template v-slot:control>
<div class="row col-12">
......@@ -114,10 +119,20 @@
</div>
</template>
</q-field>
</div>
<div class="row">
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.CourseTimeId"
ref="CourseTime" :options="CourseTimeList" label="关联上课时段" class="col-6 q-pr-lg q-pb-lg" emit-value
map-options />
</div>
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.OpenBankLevelList"
multiple use-chips ref="LevelData" :options="LevelData" label="课程关联题库" class="col-6 q-pr-lg q-pb-lg"
emit-value map-options />
</div>
</div>
<div class="row" v-if="objOption.IsScrollClass==1">
<q-input filled stack-label v-model="objOption.ScrollMinNum" ref="ScrollMinNum" class="col-6 q-pr-lg q-pb-lg"
label="最小上课人数" :rules="[val => !!val || '请填写最小上课人数']" />
......@@ -125,10 +140,10 @@
label="最大上课人数" :rules="[val => !!val || '请填写最大上课人数']" />
</div>
<div class="row">
<q-input filled stack-label v-model="objOption.FreeCoffeeNum" ref="FreeCoffeeNum" class="col-6 q-pr-lg q-pb-lg"
label="赠送咖啡杯数" :rules="[val => val >=0 || '请填写赠送咖啡杯数']" />
<q-input filled stack-label v-model="objOption.AddHoursMoney" ref="AddHoursMoney" class="col-6 q-pr-lg q-pb-lg"
label="课程增加课时费" :rules="[val => val >=0 || '请填写课程增加课时费']" />
<q-input filled stack-label v-model="objOption.FreeCoffeeNum" ref="FreeCoffeeNum"
class="col-6 q-pr-lg q-pb-lg" label="赠送咖啡杯数" :rules="[val => val >=0 || '请填写赠送咖啡杯数']" />
<q-input filled stack-label v-model="objOption.AddHoursMoney" ref="AddHoursMoney"
class="col-6 q-pr-lg q-pb-lg" label="课程增加课时费" :rules="[val => val >=0 || '请填写课程增加课时费']" />
</div>
<div class="row wrap">
<div class="col-6">
......@@ -153,13 +168,7 @@
style="display:none" />
</div>
</div>
<div class="row wrap">
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.OpenBankLevelList" multiple
use-chips ref="LevelData" :options="LevelData" label="课程关联题库" class="col-6 q-pr-lg q-pb-lg"
emit-value map-options />
</div>
</div>
<div class="row wrap">
<div class="col-12 q-pr-lg q-pb-lg">
<q-input v-model="objOption.ContractInfo" filled type="textarea" placeholder="合同补充协议" />
......@@ -267,8 +276,10 @@
FreeCoffeeNum: 0, // 赠送咖啡
AddHoursMoney: 0, // 课程增加课时费
CourseTimeId: 0, // 关联上课时段
ContractInfo: "",//合同补充协议
OpenBankLevelList: []
ContractInfo: "", //合同补充协议
OpenBankLevelList: [], //开放题库
ChineseHours: "", //中教课时
ForeignHours: "", //外教课时
},
CourseTimeList: [], //上课时段列表
CourseEmphasis: [], //数据临时存放
......@@ -288,7 +299,7 @@
courseLevelList: [], //课程等级列表
courseSubjectList: [], //课程科目列表
keynoteList: [], //重点枚举列表
LevelData:[]
LevelData: []
};
},
created() {
......@@ -327,9 +338,9 @@
},
methods: {
//获取关联考试等级
getLevel(){
getLevel() {
GetBankTypeList({}).then(res => {
if(res.Code==1){
if (res.Code == 1) {
this.LevelData = res.Data;
}
})
......@@ -510,6 +521,8 @@
this.objOption.AddHoursMoney = res.Data.AddHoursMoney;
this.objOption.CourseTimeId = res.Data.CourseTimeId;
this.objOption.OpenBankLevelList = res.Data.OpenBankLevelList;
this.objOption.ChineseHours = res.Data.ChineseHours;
this.objOption.ForeignHours = res.Data.ForeignHours;
this.CourseEmphasis = [];
setTimeout(() => {
//Todo 暂时不知道什么原因 偶尔会出现2个 所以加了一个延迟
......@@ -570,6 +583,8 @@
this.objOption.AddHoursMoney = 0;
this.objOption.CourseTimeId = 0;
this.objOption.OpenBankLevelList = [];
this.objOption.ChineseHours = "";
this.objOption.ForeignHours = "";
}
},
//关闭弹窗
......@@ -580,13 +595,13 @@
//保存菜单
saveCourse() {
this.$refs.CourseName.validate();
this.$refs.ClassHours.validate();
//this.$refs.ClassHours.validate();
this.$refs.CateId.validate();
this.$refs.FreeCoffeeNum.validate();
this.$refs.AddHoursMoney.validate();
//!this.$refs.ClassHours.hasError &&
if (
!this.$refs.CourseName.hasError &&
!this.$refs.ClassHours.hasError &&
!this.$refs.CateId.hasError &&
!this.$refs.FreeCoffeeNum.hasError &&
!this.$refs.AddHoursMoney.hasError
......
src/components/sale/orderlist.vue
View file @ 675e4201
......@@ -1640,7 +1640,6 @@
item.tab = tab;
this.myorderObjOption = item;
this.isShowmyorderForm = true;
console.log(this.myorderObjOption,'====')
},
//关闭订单详情
closeMOSaveForm() {
......
src/components/schedul/reservelist.vue
View file @ 675e4201
......@@ -64,6 +64,20 @@
</span>
</q-td>
</template>
<template v-slot:body-cell-OrderCount="props">
<q-td auto-width :props="props">
<q-badge color="green">
{{props.row.OrderCount}}
</q-badge>
</q-td>
</template>
<template v-slot:body-cell-FailCount="props">
<q-td auto-width :props="props">
<q-badge color="red">
{{props.row.FailCount}}
</q-badge>
</q-td>
</template>
<template v-slot:body-cell-TeacherId="props">
<q-td :props="props">
<q-btn-dropdown v-if="authObj&&authObj.isShowEdit" flat size="xs" color="dark" label="更多">
......@@ -163,7 +177,7 @@
},
{
name: 'OrderCount',
label: '转订单人数',
label: '试听成功',
align: 'left',
field: 'OrderCount',
},
......@@ -173,6 +187,12 @@
align: 'left',
field: 'ConversionRates',
},
{
name: 'FailCount',
label: '试听失败',
align: 'left',
field: 'FailCount',
},
{
name: 'ClassContent',
label: '试讲内容',
......@@ -199,8 +219,9 @@
],
//表格可见列
visibleColumns: [
'TeacherName', 'ClassDateStr', 'ClassTime', 'RoomName', 'LessonName', 'JoinNum', 'OrderCount', 'ConversionRates', 'ClassContent', "ReserveType",
'CreateByName','TeacherId'
'TeacherName', 'ClassDateStr', 'ClassTime', 'RoomName', 'LessonName', 'JoinNum', 'OrderCount', 'FailCount',
'ConversionRates', 'ClassContent', "ReserveType",
'CreateByName', 'TeacherId'
], //可见列
reserveObj: {},
isShowReserve: false,
......
src/components/school/student/student-Assit.vue
View file @ 675e4201
<style>
.delAssist {
.delAssist {
position: absolute;
right: -16px;
top: -12px;
......@@ -12,58 +12,129 @@
text-align: center;
line-height: 20px;
cursor: pointer;
}
}
.studentAssitTable {
.studentAssitTable {
width: 100%;
text-align: center;
}
}
.studentAssitTable td {
.studentAssitTable td {
height: 40px;
line-height: 40px;
border: 1px solid #f2f2f2;
}
}
.studentAssitTable th {
.studentAssitTable th {
height: 40px;
background-color: #f2f2f2;
}
}
</style>
<template>
<div>
<!--课程顾问 或有教师权限-->
<template v-if="userInfo.IsCourseConsultant == 1||isHaveTeacherEdit||isHaveXueManager">
<q-btn label="新增" color="accent q-mb-lg" size="sm" @click="isShowAdd = true" />
<template
v-if="
userInfo.IsCourseConsultant == 1 ||
isHaveTeacherEdit ||
isHaveXueManager
"
>
<q-btn
label="新增"
color="accent q-mb-lg"
size="sm"
@click="isShowAdd = true"
/>
</template>
<template v-else>
<span class="text-grey-4">抱歉，你没有权限邀请其他服务人员</span>
</template>
<q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm"
@click="isShowAdd = false" />
<q-btn
label="取消"
style="margin-left:20px;"
v-if="isShowAdd"
flat
color="grey-10 q-mb-lg"
size="sm"
@click="isShowAdd = false"
/>
<template v-if="isShowAdd">
<div class="row wrap">
<q-select filled stack-label option-label="Name" @input="changeData" v-model="AssitMsg.AssistType"
option-value="Id" :options="AssistDropList" label="角色" dense class="col-6 q-pb-lg q-pr-lg" emit-value
map-options />
<q-select filled dense v-if="AssitMsg.AssistType == 2" v-model="AssitMsg.AssistId" :options="RoleListData"
option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value map-options />
<q-select filled dense v-if="AssitMsg.AssistType == 4" v-model="AssitMsg.AssistId"
:options="TeacherList" option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value
map-options />
<q-select filled dense v-else v-model="AssitMsg.AssistId" @filter="filterEmployee" use-input
:options="myEmployeeList" option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value
map-options />
<q-select
filled
stack-label
option-label="Name"
@input="changeData"
v-model="AssitMsg.AssistType"
option-value="Id"
:options="AssistDropList"
label="角色"
dense
use-input
class="col-6 q-pb-lg q-pr-lg"
emit-value
map-options
/>
<q-select
filled
dense
v-if="AssitMsg.AssistType == 2"
v-model="AssitMsg.AssistId"
:options="RoleListData"
option-label="EmployeeName"
class="col-6 q-pb-lg"
option-value="Id"
emit-value
use-input
map-options
/>
<q-select
filled
dense
v-else-if="AssitMsg.AssistType == 4"
v-model="AssitMsg.AssistId"
:options="TeacherList"
option-label="EmployeeName"
class="col-6 q-pb-lg"
option-value="Id"
emit-value
use-input
map-options
/>
<q-select
filled
dense
v-else
v-model="AssitMsg.AssistId"
@filter="filterEmployee"
use-input
:options="myEmployeeList"
option-label="EmployeeName"
class="col-6 q-pb-lg"
option-value="Id"
emit-value
map-options
/>
<i class="iconfont icon-close delAssist"></i>
</div>
<div class="row wrap" style="margin-bottom:10px;float:right;">
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAssit()" />
<q-btn
label="保存"
color="accent q-mb-lg"
size="md"
@click="saveAssit()"
/>
</div>
</template>
<div v-if="dataList.length > 0">
<table class="studentAssitTable" style="border:1px solid #f2f2f2;border-collapse:collapse;" cellspacing="0"
cellpadding="0">
<table
class="studentAssitTable"
style="border:1px solid #f2f2f2;border-collapse:collapse;"
cellspacing="0"
cellpadding="0"
>
<tr>
<th style="width:180px;">角色</th>
<th style="width:180px;">人员</th>
......@@ -73,18 +144,57 @@
<td>{{ item.AssistTypeName }}</td>
<td>{{ item.AssistName }}</td>
<td>
<template v-if="userInfo.IsCourseConsultant == 1||isHaveTeacherEdit||isHaveXueManager">
<div v-if="userInfo.IsCourseConsultant == 1&&(item.AssistType == 2 ||item.AssistType == 3)">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="修改"
@click="getEditInfo(item)"></q-btn>
<q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
@click="deleteAssits(item.Id)" />
<template
v-if="
userInfo.IsCourseConsultant == 1 ||
isHaveTeacherEdit ||
isHaveXueManager
"
>
<div
v-if="
userInfo.IsCourseConsultant == 1 &&
(item.AssistType == 2 || item.AssistType == 3)
"
>
<q-btn
flat
size="xs"
icon="edit"
color="accent"
style="font-weight:400"
label="修改"
@click="getEditInfo(item)"
></q-btn>
<q-btn
flat
size="xs"
icon="delete"
color="negative"
style="font-weight:400"
label="删除"
@click="deleteAssits(item.Id)"
/>
</div>
<div v-if="isHaveTeacherEdit &&item.AssistType ==4">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="修改"
@click="getEditInfo(item)"></q-btn>
<q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
@click="deleteAssits(item.Id)" />
<div v-if="isHaveTeacherEdit && item.AssistType == 4">
<q-btn
flat
size="xs"
icon="edit"
color="accent"
style="font-weight:400"
label="修改"
@click="getEditInfo(item)"
></q-btn>
<q-btn
flat
size="xs"
icon="delete"
color="negative"
style="font-weight:400"
label="删除"
@click="deleteAssits(item.Id)"
/>
</div>
</template>
</td>
......@@ -94,20 +204,16 @@
</div>
</template>
<script>
import {
import {
GetAssistTypeList,
SetStudentAssist,
GetStudentAssistList,
RemoveStudentAssist
} from "../../../api/sale/sale";
import {
queryEmployee
} from "../../../api/users/user";
import {
mapState
} from "vuex";
} from "../../../api/sale/sale";
import { queryEmployee } from "../../../api/users/user";
import { mapState } from "vuex";
export default {
export default {
meta: {
title: ""
},
......@@ -169,8 +275,7 @@
}
}
return false;
},
}
}),
mounted() {
this.getList();
......@@ -206,7 +311,7 @@
var queryObj = {
IsLeave: 1,
UserRole: 0,
AccountTypeStr: "",
AccountTypeStr: ""
};
if (this.AssitMsg.AssistType == 2) {
queryObj.UserRole = 2;
......@@ -215,7 +320,7 @@
});
}
if (this.AssitMsg.AssistType == 4) {
queryObj.AccountTypeStr = "2"
queryObj.AccountTypeStr = "2";
queryEmployee(queryObj).then(res => {
this.TeacherList = res.Data;
});
......@@ -303,6 +408,7 @@
this.AssitMsg.AssistId = obj.AssistId;
this.AssitMsg.AssistType = obj.AssistType;
this.isShowAdd = true;
this.changeData();
},
getGuwenEditInfo(obj) {
this.getRole();
......@@ -312,5 +418,5 @@
this.isShowAdd = true;
}
}
};
};
</script>
src/components/school/student/stufollowlist.vue 0 → 100644
View file @ 675e4201
This diff is collapsed.
src/components/stuMan/eventsCalendar.vue
View file @ 675e4201
......@@ -344,6 +344,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate: time => {
return time.getTime() < Date.now() - 8.64e7;
}
},
date:'',
value: new Date(),
calendarData:[],
......
src/components/work/index.vue
View file @ 675e4201
......@@ -127,7 +127,7 @@
</div> -->
<q-btn-group
outline
style="position: fixed;top: 15px;right:20px;z-index: 666666;"
style="position: fixed;top: 75px;right:20px;z-index: 666666;"
>
<q-btn
dense
......
src/pages/Work.vue
View file @ 675e4201
......@@ -271,7 +271,7 @@ export default {
.sub-header {
position: fixed;
height: 56px;
top: 0;
top: 60px;
left: 0;
right: 0;
transition: top 0.3s ease;
......
src/pages/activity/configurationstudentsList.vue
View file @ 675e4201
......@@ -8,27 +8,26 @@
<div class="col-2 q-table__title">意见调查信息</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" icon="add" label="新增" @click="addObj(null)"/>
<!-- @click="addObj(null)" -->
<q-btn color="accent" size="sm" icon="add" label="新增" @click="addObj(null)" />
</div>
</template>
<template v-slot:body-cell-IsRequired="props">
<template v-slot:body-cell-IsRequired="props">
<q-td :props="props">
<span v-if="props.row.IsRequired==0">否</span>
<span v-if="props.row.IsRequired==1">是</span>
</q-td>
</template>
<template v-slot:body-cell-IsShow="props">
<template v-slot:body-cell-IsShow="props">
<q-td :props="props">
<span v-if="props.row.IsShow==0">是</span>
<span v-if="props.row.IsShow==1">否</span>
</q-td>
</template>
<template v-slot:bottom>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template>
<template v-slot:body-cell-optioned="props">
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="addObj(props.row)" />
......@@ -36,10 +35,11 @@
@click="delQuestion(props.row)" />
</q-td>
</template>
</q-table>
<student-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></student-form>
</div>
</div>
</q-table>
<student-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.SurveyId" @close="closeSaveForm"
@success="resetSearch"></student-form>
</div>
</div>
</template>
<script>
import studentForm from '../../components/activity/student-from'
......@@ -66,6 +66,16 @@
label: '学员名称',
field: 'GuestName',
align: 'left'
}, {
name: 'StartTime',
label: '开始时间',
field: 'StartTime',
align: 'left'
}, {
name: 'EndTime',
label: '结束时间',
field: 'EndTime',
align: 'left'
},
{
......@@ -80,9 +90,8 @@
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SurveyId: 1,
SurveyId: 0,
},
pageCount: 0,
isShowWenjuan: false,
objOption: null,
......@@ -90,15 +99,13 @@
},
created() {
if (this.$route.query && this.$route.query.ID) {
this.msg.ActivitySurveyId = this.$route.query.ID;
this.msg.SurveyId = this.$route.query.ID;
}
},
mounted() {
this.getList();
},
methods: {
resetSearch() {
this.msg.pageIndex = 1;
this.getList();
......@@ -109,11 +116,9 @@
this.loading = false;
if (res.Code == 1) {
this.dataList = res.Data.PageData;
this.pageCount = res.Data.Count
this.pageCount = res.Data.PageCount;
}
console.log("res", res);
});
},
addObj(obj) {
if (obj) {
......@@ -142,9 +147,6 @@
removeActivitySurveyGuest({
Id: row.Id
}).then(res => {
this.dataList = '';
this.pageCount = '';
console.log(res + '111111')
if (res.Code == 1) {
that.$q.notify({
icon: 'iconfont icon-chenggong',
......@@ -164,7 +166,6 @@
})
})
},
closeSaveForm() {
this.isShowWenjuan = false;
},
......
src/pages/course/course.vue
View file @ 675e4201
This diff is collapsed.
src/pages/course/lessonNotes.vue
View file @ 675e4201
......@@ -95,6 +95,13 @@
</div>
</q-td>
</template>
<template v-slot:body-cell-ClassHours="props">
<q-td :props="props">
<span>总&nbsp;&nbsp;课&nbsp;&nbsp;时：{{ props.row.ClassHours }}</span><br />
<span>中教课时：{{ props.row.ChineseHours }}</span><br />
<span>外教课时：{{ props.row.ForeignHours }}</span>
</q-td>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-badge :color="props.value == 1 ? 'negative' : 'primary'" :label="props.value == 0 ? '正常' : '删除'" />
......@@ -170,7 +177,6 @@
label: "课时长度",
field: "ClassHours",
align: "left",
format: (val, row) => `${val}课时`
},
{
name: "UpdateTimeStr",
......
src/pages/financial/market/empBonusDetail.vue
View file @ 675e4201
......@@ -119,6 +119,11 @@
this.msg.PeriodId = this.$route.query.Id;
this.getList();
}
if(this.$route.query.UserId){
this.msg.EmployeeId = this.$route.query.UserId
this.msg.YearNum = this.$route.query.Periods.slice(0,4)
this.msg.MonthNum = this.$route.query.Periods.slice(5,7)
}
},
methods: {
//获取分页列表
......
src/pages/financial/market/marketStatistics.vue
View file @ 675e4201
......@@ -33,7 +33,7 @@
</style>
<template>
<template>
<div class="page-body cycleOrderList">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
......@@ -194,7 +194,7 @@
</template>
</div>
</template>
</template>
<script>
import {
getSchoolDropdown
......@@ -218,6 +218,7 @@
import {
EduDownLoad,
} from '../../../api/common/common';
import { number } from 'echarts'
export default {
meta: {
title: "业绩提成统计"
......@@ -279,13 +280,21 @@
if(this.$route.query && this.$route.query.OrderId){
this.msg.OrderId = this.$route.query.OrderId
}
// 从业绩表跳转带参
if(this.$route.query && this.$route.query.UserId){
this.PersionList = JSON.parse(JSON.stringify(this.AllemployeeList))
this.msg.UserId = this.$route.query.UserId - 0
}
this.getList()
this.setClass()
this.getBranchList()
this.getEmployee();//销售
this.getPeriodList()//周期
this.setClass()//班级
this.getBranchList()//校区
this.getDepartList(0);
this.getEmployee();
this.getPeriodList()
},
......@@ -295,6 +304,7 @@
this.getList()
},
getList(){
console.log(this.msg, '02222222222')
if(this.msg)
this.loading = true;
getSellAchievementsStatistics(this.msg).then(res => {
......@@ -428,8 +438,14 @@
Id: 0
}
this.PeriodsList.unshift(obj)
// 从业绩表跳转带参
if(this.$route.query.Periods){
this.PeriodsList.forEach(item=>{
if(item.Periods==this.$route.query.Periods){
this.msg.PeriodId = item.Id
}
})
}
}
})
},
......
src/pages/sale/courseList.vue
View file @ 675e4201
......@@ -109,7 +109,6 @@
line-height: 25px;
background-color: #004d40;
}
</style>
<template>
<div class="page-body courseList">
......@@ -117,8 +116,8 @@
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目"
clearable />
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options
label="所属科目" clearable />
</div>
<div class="col-3">
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.CourseName" label="课程名称"
......@@ -136,11 +135,6 @@
<!-- <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="创建报价单" @click="createQuotation" /> -->
</div>
</template>
<!-- <template v-slot:body-cell-OpenBankLevelNameList="props">
<q-td auto-width :props="props">
<span v-for="item in props.row.OpenBankLevelNameList">{{item}}</span>
</q-td>
</template> -->
<template v-slot:body="props">
<q-tr :props="props">
<q-td auto-width>
......@@ -154,7 +148,7 @@
</q-img>
</q-td>
<q-td v-else-if="col.name=='OpenBankLevelNameList'" :key="col.name">
<span style="margin-right:10px;" v-for="x in col.value">{{x}}</span>
<span style="margin-right:10px;" v-for="(x,index) in col.value" :key="index">{{x}}</span>
</q-td>
<q-td v-else-if="col.name == 'PreferentialList'" style="padding-right:0px" :key="col.name">
<div v-for="(x,index) in col.value" :key="index">
......@@ -193,7 +187,8 @@
<div class="remark-font">暂无优惠政策</div>
</div>
</q-td>
<q-td v-else-if="col.name == 'PreferentialListSellCommission'" style="padding-right:0px;padding-left:0px" :key="col.name">
<q-td v-else-if="col.name == 'PreferentialListSellCommission'" style="padding-right:0px;padding-left:0px"
:key="col.name">
<div v-for="(x,index) in col.value" :key="index">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px"
:class="{'text-red':x.SaleCommissionType==1}" v-if="x.PriceDiscountType!=0">
......@@ -211,7 +206,6 @@
<div class="border-bottom" style="padding-left: 16px" :class="{'text-red':x.B2BCommissionType==1}"
v-if="x.PriceDiscountType!=0">
{{x.B2BCommissionType==1?'￥':''}}{{x.B2BCommissionMoney}}{{x.B2BCommissionType==0?'%':''}}</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
......@@ -265,6 +259,12 @@
</q-chip>
</div>
</q-td>
<q-td v-else-if="col.name=='ClassHours'" :key="col.name">
<span>总&nbsp;&nbsp;课&nbsp;&nbsp;时：{{ props.row.ClassHours }}</span><br />
<span>中教课时：{{ props.row.ChineseHours }}</span><br />
<span>外教课时：{{ props.row.ForeignHours }}</span>
</q-td>
<q-td v-else-if="col.name=='CourseIntro'" :key="col.name">
<q-btn flat color="primary" label="查看详情" @click="showContentDialog(col.value)" />
</q-td>
......@@ -311,7 +311,9 @@
getCourseSubject
} from "../../api/course/index";
import quotationForm from '../../components/sale/quotation-form'
import { mapState } from "vuex";
import {
mapState
} from "vuex";
export default {
meta: {
title: "课程报价表"
......@@ -518,10 +520,10 @@
CourseSubjectList: [], //科目列表
};
},
created(){
created() {
var localStorageData = window.localStorage["loginUserInfo"];
let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList;
var isShowPrice=false;
var isShowPrice = false;
if (ActionMenuList && ActionMenuList.length > 0) {
ActionMenuList.forEach((x) => {
if (x.FunctionCode == "IsShow_CoursePrice") {
......@@ -529,13 +531,19 @@
}
});
}
if(isShowPrice){
this.visibleColumns = ['CourseFeature', 'CoverImg', 'CourseSubjectName', 'CourseName', 'OpenBankLevelNameList' , 'CateName', 'OriginalPrice', 'SellPrice', 'PreferentialListSellCommission',
'PreferentialListB2BCommission', 'B2CRatio', 'B2CReNewRatio' , 'CommissionReType' , 'B2BRebateRatio' , 'B2BReNewRatio' ,'SchoolRebateRatio',
'SchoolReNewRatio','TransIntroductceRatio','TransIntroductceReNewRatio','InnerRecommendRatio','InnerRecommendReNewRatio','B2CRbRatio',
'B2CRNRatio','TeacherList','ClassHours','CourseIntro','UpdateTimeStr']
}else{
this.visibleColumns = ['CourseFeature', 'CoverImg', 'CourseSubjectName', 'CourseName', 'OpenBankLevelNameList', 'CateName','TeacherList','ClassHours','CourseIntro','UpdateTimeStr']
if (isShowPrice) {
this.visibleColumns = ['CourseFeature', 'CoverImg', 'CourseSubjectName', 'CourseName', 'OpenBankLevelNameList',
'CateName', 'OriginalPrice', 'SellPrice', 'PreferentialListSellCommission',
'PreferentialListB2BCommission', 'B2CRatio', 'B2CReNewRatio', 'CommissionReType', 'B2BRebateRatio',
'B2BReNewRatio', 'SchoolRebateRatio',
'SchoolReNewRatio', 'TransIntroductceRatio', 'TransIntroductceReNewRatio', 'InnerRecommendRatio',
'InnerRecommendReNewRatio', 'B2CRbRatio',
'B2CRNRatio', 'TeacherList', 'ClassHours', 'CourseIntro', 'UpdateTimeStr'
]
} else {
this.visibleColumns = ['CourseFeature', 'CoverImg', 'CourseSubjectName', 'CourseName', 'OpenBankLevelNameList',
'CateName', 'TeacherList', 'ClassHours', 'CourseIntro', 'UpdateTimeStr'
]
}
},
mounted() {
......@@ -590,7 +598,6 @@
}
}
};
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
......
src/pages/sale/marketTracking.vue 0 → 100644
View file @ 675e4201
This diff is collapsed.
src/pages/sale/orderStatistics.vue
View file @ 675e4201
......@@ -285,6 +285,14 @@
this.getCourseList();
},
mounted() {
if(this.$route.query.UserId){
this.msg.EnterID = this.$route.query.UserId-0
let y = this.$route.query.Periods.slice(0,4)
let m = this.$route.query.Periods.slice(5,8)
let d = new Date(y,m,0).getDate()
this.msg.StartTime = this.$route.query.Periods
this.msg.EndTime = y +'-' + m +'-'+ d
}
this.getList();
this.getEmployee(0);
this.getglteacher();
......
src/pages/sale/reserveClass.vue
View file @ 675e4201
......@@ -87,6 +87,17 @@
var day = nowDay.getDate(); //日
this.msg.StartClassDate = year + '-' + month + '-' + day
if (this.$route.query) {
if (this.$route.query.StartClassDate) {
this.msg.StartClassDate = this.$route.query.StartClassDate;
}
if (this.$route.query.EndClassDate) {
this.msg.EndClassDate = this.$route.query.EndClassDate;
}
if (this.$route.query.TeacherId) {
this.msg.TeacherId = Number(this.$route.query.TeacherId);
}
}
this.GetTeacherList();
this.getClassRoomList();
this.getList()
......
src/pages/sale/reserveStudentList.vue
View file @ 675e4201
......@@ -12,6 +12,20 @@
<div class="page-option">
</div>
</template>
<template v-slot:body-cell-SpeakState="props">
<q-td :props="props">
<template v-if="props.row.OrderCount>0">
<q-badge color="green">
试讲成功
</q-badge>
</template>
<template v-else>
<q-badge color="red">
试讲失败
</q-badge>
</template>
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
......@@ -94,6 +108,18 @@
field: 'TeacherName',
align: 'left'
},
{
name: 'OrderCount',
label: '订单数量',
field: 'OrderCount',
align: 'left'
},
{
name: 'SpeakState',
label: '试讲',
field: 'SpeakState',
align: 'left'
},
{
name: 'RoomName',
label: '教室',
......
src/pages/sale/studentTracking.vue
View file @ 675e4201
This diff is collapsed.
src/pages/teacher/appraisalList.vue
View file @ 675e4201
......@@ -159,17 +159,27 @@
}
}),
created() {
this.findData();
let today = new Date();
this.msg.YearStr = today.getFullYear().toString();
this.msg.MonthStr = (today.getMonth() + 1).toString();
this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr;
this.findData();
if (this.$route.query) {
if (this.$route.query.TeacherAccountId) {
this.msg.TeacherAccountId = Number(this.$route.query.TeacherAccountId)
}
if (this.$route.query.YearStr && this.$route.query.MonthStr) {
this.msg.YearStr = this.$route.query.YearStr;
this.msg.MonthStr = this.$route.query.MonthStr
this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr
}
}
},
mounted() {
if (!this.isHaveEdit) {
let userinfo = this.getLocalStorage();
this.msg.TeacherAccountId = userinfo.Id;
}
// if (!this.isHaveEdit) {
// let userinfo = this.getLocalStorage();
// this.msg.TeacherAccountId = userinfo.Id;
// }
this.getTeacherAssessmentPage()
},
methods: {
......
src/pages/teacher/assessmentType.vue
View file @ 675e4201
......@@ -30,8 +30,7 @@
<template :props="props" v-for="(col,cIndex) in props.row.SubtypeList">
<template v-if="cIndex==0">
<q-tr :key="cIndex+(props.rowIndex*10000)">
<q-td key="TypeName" :props="props" :rowspan="props.row.SubtypeList.length"
class="assessmentType_td">
<q-td key="TypeName" :props="props" :rowspan="props.row.SubtypeList.length" class="assessmentType_td">
{{ props.row.TypeName }}
</q-td>
<q-td class="assessmentType_td">
......@@ -39,14 +38,14 @@
</q-td>
<template v-for="(subItem,subIndex) in props.row.SubtypeList[cIndex].OptionList">
<q-td :key="subIndex+200000" class="assessmentType_td">
<div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green">
<div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green" v-if="subItem.LevelScore>0">
{{subItem.LevelScore}}分
</q-badge>
</div>
</q-td>
</template>
<q-td key="Id" :props="props" :rowspan="props.row.SubtypeList.length"
class="assessmentType_td" style="border-right: 1px solid rgba(0, 0, 0, 0.12);">
<q-td key="Id" :props="props" :rowspan="props.row.SubtypeList.length" class="assessmentType_td"
style="border-right: 1px solid rgba(0, 0, 0, 0.12);">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="AddMsg(props.row)" />
<q-btn flat size="xs" icon="delete" color="negative" class="q-mr-xs" label="删除"
......@@ -61,7 +60,7 @@
</q-td>
<template v-for="(subItem,subIndex) in props.row.SubtypeList[cIndex].OptionList">
<q-td :key="subIndex+400000" class="assessmentType_td">
<div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green">
<div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green" v-if="subItem.LevelScore>0">
{{subItem.LevelScore}}分
</q-badge>
</div>
......@@ -111,39 +110,13 @@
methods: {
getAssessmentTypeList() {
this.loading = true;
this.columns=[];
this.columns = [];
queryAssessmentTypeList(this.msg).then(res => {
this.loading = false;
console.log("res", res);
if (res.Code == 1) {
this.dataList = res.Data;
this.columns.push({
name: "TypeName",
label: "类别",
field: "TypeName",
align: "left"
});
this.columns.push({
name: "SubtypeList",
label: "内容",
field: "SubtypeList",
align: "left"
});
if (this.dataList && this.dataList.length > 0) {
this.dataList[0].SubtypeList[0].OptionList.forEach(item => {
this.columns.push({
name: item.LevelTitle,
label: item.LevelTitle,
field: item.LevelTitle,
align: "left"
})
})
}
this.columns.push({
name: 'Id',
label: '操作',
field: row => row.Id
})
this.dataList = res.Data.result;
this.columns = res.Data.header;
}
})
},
......
src/pages/teacher/dayStatic.vue
View file @ 675e4201
......@@ -56,14 +56,25 @@
separator="none" :data="dataList" :columns="columns" row-key="">
<q-tr slot="header" slot-scope="props" :props="props">
<template v-for="col in props.cols" :props="props">
<template v-if="col.label=='线上与学生互动数'">
<template v-if="col.label=='续约(含留学)'">
<q-th :key="col.name" :props="props" style="max-width:60px;text-align:center;">
续约<br />(含留学)
</q-th>
</template>
<template v-else-if="col.label=='班主任学生互动'">
<q-th :key="col.name" :props="props" style="max-width:75px;text-align:center;">
线上与学生<br />互动数
班主任<br />学生互动
</q-th>
</template>
<template v-else-if="col.label=='续约(含留学)'">
<q-th :key="col.name" :props="props" style="max-width:60px;text-align:center;">
续约<br />(含留学)
<template v-else-if="col.label=='班主任学生互动得分'">
<q-th :key="col.name" :props="props" style="max-width:90px;text-align:center;">
班主任学生<br />互动得分
</q-th>
</template>
<template v-else-if="col.label=='企业微信互动次数'">
<q-th :key="col.name" :props="props" style="max-width:90px;text-align:center;">
企业微信<br />互动次数
</q-th>
</template>
<template v-else-if="col.label=='学生退课'">
......@@ -71,33 +82,35 @@
学生退课
</q-th>
</template>
<template v-else-if="col.label=='学生投诉'">
<q-th :key="col.name" :props="props" style="background-color:#FF66CC;color:#000;">
学生投诉
<template v-else-if="col.label=='试讲成功(班课)'">
<q-th :key="col.name" :props="props">
试讲成功<br />(班课)
</q-th>
</template>
<template v-else-if="col.label=='老师迟到早退'">
<q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#FF66CC;color:#000;">
老师<br />迟到早退
<template v-else-if="col.label=='试讲成功(VIP)'">
<q-th :key="col.name" :props="props">
试讲成功<br />(VIP)
</q-th>
</template>
<template v-else-if="col.label=='N5课程时数'">
<q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#E2EFDA;color:#000;">
N5<br />课程时数
<template v-else-if="col.label=='试讲失败'">
<q-th :key="col.name" :props="props" style="background-color:#FF66CC;color:#000;">
试讲失败
</q-th>
</template>
<template v-else-if="col.label=='N4课程时数'">
<q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#E2EFDA;color:#000;">
N4<br />课程时数
<template v-else-if="col.label=='学生旷课'">
<q-th :key="col.name" :props="props" style="background-color:#FF66CC;color:#000;">
学生旷课
</q-th>
</template>
<template v-else-if="col.label=='N3课程时数'">
<template v-else-if="col.label=='学生投诉'">
<q-th :key="col.name" :props="props" style="background-color:#FF66CC;color:#000;">
学生投诉
</q-th>
</template>
<template v-else-if="col.label=='老师迟到早退'">
<q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#E2EFDA;color:#000;">
N3<br />课程时数
style="max-width:60px;text-align:center;background-color:#FF66CC;color:#000;">
老师<br />迟到早退
</q-th>
</template>
<template v-else-if="col.label=='N2课程时数'">
......@@ -154,7 +167,20 @@
</template>
</template>
</q-tr>
<template v-slot:body-cell-FinishTimesPlanCount2="props">
<q-td :props="props">
<span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row,1)">
{{props.row.OnLineInteractiveScore}}
</span>
</q-td>
</template>
<template v-slot:body-cell-FinishTimesPlanCount="props">
<q-td :props="props">
<span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row,1)">
{{props.row.FinishFollow}} /
{{props.row.TotalFollow}}</span>
</q-td>
</template>
<template v-slot:bottom>
</template>
</q-table>
......@@ -185,26 +211,34 @@
field: 'DateStr',
align: 'left'
},
// {
// name: 'StudentCount',
// label: '学生人次',
// field: 'StudentCount',
// align: 'left'
// },
{
name: 'StudentCount',
label: '学生人数',
field: 'StudentCount',
name: 'FinishTimesPlanCount',
label: '班主任学生互动',
align: 'left'
},
{
name: 'FinishTimesPlanCount2',
label: '班主任学生互动得分',
align: 'left'
},
{
name: 'OnLineInteractive',
label: '企业微信互动次数',
field: 'OnLineInteractive',
align: 'left'
},
{
name: 'AttendClassHourScore',
label: '上课时数',
field: 'AttendClassHourScore',
align: 'left',
},
{
name: 'OnLineInteractiveScore',
label: '线上与学生互动数',
field: 'OnLineInteractiveScore',
align: 'left',
style: 'max-width: 50px',
},
{
name: 'RenewScore',
label: '续约(含留学)',
......@@ -217,6 +251,12 @@
field: 'UpgradeScore',
align: 'left'
},
{
name: 'GradeTestScore',
label: '考级升级',
field: 'GradeTestScore',
align: 'left',
},
{
name: 'TransScore',
label: '转介绍',
......@@ -224,9 +264,21 @@
align: 'left'
},
{
name: 'TrialSpeakScore',
label: '试讲',
field: 'TrialSpeakScore',
name: 'SpeakClassScore',
label: '试讲成功(班课)',
field: 'SpeakClassScore',
align: 'left'
},
{
name: 'SpeakVipScore',
label: '试讲成功(VIP)',
field: 'SpeakVipScore',
align: 'left'
},
{
name: 'SpeakFailScore',
label: '试讲失败',
field: 'SpeakFailScore',
align: 'left'
},
{
......@@ -253,24 +305,24 @@
field: 'TeacherBeLateScore',
align: 'left'
},
{
name: 'N5ClassHoursScore',
label: 'N5课程时数',
field: 'N5ClassHoursScore',
align: 'left'
},
{
name: 'N4ClassHoursScore',
label: 'N4课程时数',
field: 'N4ClassHoursScore',
align: 'left'
},
{
name: 'N3ClassHoursScore',
label: 'N3课程时数',
field: 'N3ClassHoursScore',
align: 'left'
},
// {
// name: 'N5ClassHoursScore',
// label: 'N5课程时数',
// field: 'N5ClassHoursScore',
// align: 'left'
// },
// {
// name: 'N4ClassHoursScore',
// label: 'N4课程时数',
// field: 'N4ClassHoursScore',
// align: 'left'
// },
// {
// name: 'N3ClassHoursScore',
// label: 'N3课程时数',
// field: 'N3ClassHoursScore',
// align: 'left'
// },
{
name: 'N2ClassHoursScore',
label: 'N2课程时数',
......
src/pages/teacher/jobEvaluation.vue
View file @ 675e4201
......@@ -69,10 +69,12 @@
<tr v-for="(sItem,sIndex) in item.SubtypeList" :key="sIndex">
<td>{{sItem.SubTypeName}}</td>
<td v-for="(cItem,cIndex) in sItem.OptionList" style="position:relative;" :key="cIndex">
<template v-if="cItem.LevelDesc!=''&&cItem.LevelScore>0">
<el-tooltip class="item" effect="dark" :content="cItem.LevelDesc" placement="top-start">
<i style="position:absolute;left:3px;top:3px;" class="iconfont icon-bangzhu"></i>
</el-tooltip>
<q-checkbox v-model="cItem.IsCheck" @input="changeStatus(sItem,cItem)" val="teal" color="green" />
</template>
</td>
<td>{{sItem.CheckScore}}</td>
</tr>
......@@ -116,13 +118,13 @@
}
},
created() {
this.GetTeacherList();
},
mounted() {
let today = new Date();
var yearStr = today.getFullYear().toString();
var monthStr = (today.getMonth() + 1).toString();
this.teacherDate = yearStr + '-' + monthStr;
this.GetTeacherList();
},
mounted() {
if (this.$route.query) {
if (this.$route.query.Id) {
this.saveObj.Id = this.$route.query.Id;
......@@ -130,6 +132,9 @@
if (this.$route.query.TeacherAccountId) {
this.saveObj.TeacherAccountId = this.$route.query.TeacherAccountId
}
if (this.$route.query.YearStr && this.$route.query.MonthStr) {
this.teacherDate = this.$route.query.YearStr + '-' + this.$route.query.MonthStr;
}
this.getInfo();
}
},
......@@ -170,8 +175,13 @@
TeacherAccountId: this.saveObj.TeacherAccountId,
YearStr: this.saveObj.YearStr,
MonthStr: this.saveObj.MonthStr,
Id: this.saveObj.Id,
Id: 0,
};
if (this.$route.query) {
if (this.$route.query.Id) {
qMsg.Id = this.$route.query.Id;
}
}
queryTeacherAssessmentInfo(qMsg).then(res => {
if (res.Code == 1) {
var tempData = res.Data;
......
src/pages/teacher/monthFirst.vue
View file @ 675e4201
This diff is collapsed.
src/pages/teacher/teacherAssessment.vue
View file @ 675e4201
......@@ -31,10 +31,12 @@
<tr v-for="(sItem,sIndex) in item.SubtypeList" :key="sIndex">
<td>{{sItem.SubTypeName}}</td>
<td v-for="(cItem,cIndex) in sItem.OptionList" style="position:relative;" :key="cIndex">
<template v-if="cItem.LevelDesc!=''&&cItem.LevelScore>0">
<el-tooltip class="item" effect="dark" :content="cItem.LevelDesc" placement="top-start">
<i style="position:absolute;left:3px;top:3px;" class="iconfont icon-bangzhu"></i>
</el-tooltip>
<q-checkbox v-model="cItem.IsCheck" disable val="teal" color="green" />
</template>
</td>
<td>{{sItem.S_TeacherScore}}</td>
<td>{{sItem.S_JiaoWuScore}}</td>
......@@ -229,7 +231,7 @@
if (res.Code == 1) {
var tempData = res.Data;
this.saveObj = tempData;
this.teacherDate=this.saveObj.YearStr+"-"+this.saveObj.MonthStr;
this.teacherDate = this.saveObj.YearStr + "-" + this.saveObj.MonthStr;
}
})
},
......
src/pages/teacher/teacherMonth.vue
View file @ 675e4201
This diff is collapsed.
src/pages/teacher/teacherTrack.vue
View file @ 675e4201
This diff is collapsed.
src/pages/test.vue
View file @ 675e4201
......@@ -97,7 +97,7 @@
},
data() {
return {
ActionStr: "/Login/Test",
ActionStr: "/TeacherStatic/InitTeacherData",
parameterList: [{
Name: "",
Value: ""
......
src/router/routes.js
View file @ 675e4201
......@@ -1236,10 +1236,15 @@ const routes = [{
import ("pages/sale/AudiopaymentDetail.vue")
},
{
path: "/sale/studentTracking", //学员跟踪分页列表
path: "/sale/studentTracking", //学员跟踪分页列表【课程顾问部使用】
component: () =>
import ("pages/sale/studentTracking.vue")
},
{
path: "/sale/marketTracking", //学员跟踪分页列表【市场部使用】
component: () =>
import ("pages/sale/marketTracking.vue")
},
{
path: "/sale/guestConsultation", //客人咨询分页列表
component: () =>
......
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