Skip to content

C
confucius
Commit 5b6d4fd0 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 75c2f4c9 4b072390
Hide whitespace changes
Inline Side-by-side
Showing with 3558 additions and 3104 deletions
package.json
View file @ 5b6d4fd0
......@@ -24,6 +24,7 @@
"cos-js-sdk-v5": "^1.1.5",
"echarts": "^5.1.2",
"element-ui": "^2.14.1",
"flv.js": "^1.6.2",
"html2canvas": "^1.3.2",
"js-md5": "^0.7.3",
"jsencrypt": "^3.2.1",
......@@ -36,6 +37,8 @@
"quasar": "^1.0.0",
"relation-graph": "^1.0.8",
"v-viewer": "^1.5.1",
"videojs-flash": "^2.2.1",
"videojs-swf": "^5.4.2",
"vue-amap": "^0.5.10",
"vue-apexcharts": "^1.6.2",
"vue-draggable-resizable": "^1.7.2",
......
quasar.conf.js
View file @ 5b6d4fd0
......@@ -51,11 +51,14 @@ module.exports = function (ctx) {
// API: 'http://192.168.10.46:8300/api',
// API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://192.168.10.17:8087/api',
API_SK: 'ws:192.168.10.214:'
API_SK: 'ws:192.168.10.214:',
API_SIG: 'http://localhost:5001/messagecenter'
} : {
API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://propertyedu.oytour.com/api',
API_SK: 'ws://47.96.23.199:'
API_SK: 'ws://47.96.23.199:',
API_SK_WSS: 'wss://sk.kookaku.com',
API_SIG: 'http://eduapi.oytour.com/messagecenter'
},
// transpile: false,
......@@ -75,12 +78,11 @@ module.exports = function (ctx) {
// https://quasar.dev/quasar-cli/handling-webpack
extendWebpack(cfg) {
// cfg.module.rules.push({
// enforce: 'pre',
// test: /\.(js|vue)$/,
// loader: 'eslint-loader',
// exclude: /node_modules/
// })
cfg.module.rules.push({
enforce: 'pre',
test: /\.swf$/,
loader: 'url-loader'
})
}
},
......@@ -188,30 +190,30 @@ module.exports = function (ctx) {
background_color: '#ffffff',
theme_color: '#027be3',
icons: [{
src: 'icons/icon-128x128.png',
sizes: '128x128',
type: 'image/png'
},
{
src: 'icons/icon-192x192.png',
sizes: '192x192',
type: 'image/png'
},
{
src: 'icons/icon-256x256.png',
sizes: '256x256',
type: 'image/png'
},
{
src: 'icons/icon-384x384.png',
sizes: '384x384',
type: 'image/png'
},
{
src: 'icons/icon-512x512.png',
sizes: '512x512',
type: 'image/png'
}
src: 'icons/icon-128x128.png',
sizes: '128x128',
type: 'image/png'
},
{
src: 'icons/icon-192x192.png',
sizes: '192x192',
type: 'image/png'
},
{
src: 'icons/icon-256x256.png',
sizes: '256x256',
type: 'image/png'
},
{
src: 'icons/icon-384x384.png',
sizes: '384x384',
type: 'image/png'
},
{
src: 'icons/icon-512x512.png',
sizes: '512x512',
type: 'image/png'
}
]
}
},
......@@ -252,7 +254,7 @@ module.exports = function (ctx) {
// More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration
nodeIntegration: true,
extendWebpack( /* cfg */ ) {
extendWebpack( /* cfg */) {
// do something with Electron main process Webpack cfg
// chainWebpack also available besides this extendWebpack
}
......
src/api/studentmsg/index.js 0 → 100644
View file @ 5b6d4fd0
import request from '../../utils/request'
import request_zc from '../../utils/request_zc'
/*
* 获取意见调查表参与学员分页列表
*/
export function getActivitySurveyGuestPage(data) {
return request({
url: '/Survey/GetActivitySurveyGuestPage',
method: 'post',
data
})
}
/*
* 新增修改意见调查表参与学员
*/
export function setActivitySurveyGuest(data) {
return request({
url: '/Survey/SetActivitySurveyGuest',
method: 'post',
data
})
}
/*
* 根据编号获取学员信息
*/
export function getActivitySurveyGuestModule(data) {
return request({
url: '/Survey/GetActivitySurveyGuestModule',
method: 'post',
data
})
}
/*
* 根据编号删除学员信息
*/
export function removeActivitySurveyGuest(data) {
return request({
url: '/Survey/RemoveActivitySurveyGuest',
method: 'post',
data
})
}
\ No newline at end of file
src/assets/css/font.css
View file @ 5b6d4fd0
@font-face {
font-family: 'perfectFont';
src: url('../font/MicrosoftYaHeiLight.woff') format('woff');
font-family: 'perfectFont';
src: url('../font/MicrosoftYaHeiLight.woff') format('woff');
}
@font-face {
font-family: 'pingfang';
src: url('../font/PingFang2.ttf');
font-family: 'pingfang';
src: url('../font/PingFang2.ttf');
}
.perfectFont {
font-family: 'perfectFont' !important;
}
src/components/teacher/assess-form.vue
View file @ 5b6d4fd0
......@@ -38,7 +38,7 @@
<q-btn size="10px" @click="addChild()" round color="primary" icon="iconfont icon-img_haha" />
</div>
</div>
<div v-for="(item,index) in addMsg.SubtypeList" class="row wrap childConfig">
<div v-for="(item,index) in addMsg.SubtypeList" class="row wrap childConfig" :key="index">
<q-btn size="10px" @click="delChild(item,index)" class="SubChild" round color="red"
icon="iconfont icon-guanbi1" />
<div class="col-12 q-pr-lg q-pb-lg">
......@@ -47,7 +47,7 @@
<div class="q-pb-lg">
<q-btn size="10px" @click="addSun(index)" round color="primary" icon="iconfont icon-img_haha" />
</div>
<div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in item.OptionList">
<div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in item.OptionList" :key="subIndex">
<div class="col-4 q-pr-lg q-pb-lg">
<q-input filled v-model="subItem.LevelTitle" dense ref="SubTypeName" label="标题"></q-input>
</div>
......
src/components/work/index.vue
View file @ 5b6d4fd0
......@@ -123,7 +123,7 @@
<div class="col q-pt-md q-pr-md">
<!-- <div class="row work_Top">
<div class="text-h6 col"></div>
</div> -->
<q-btn-group
outline
......
src/layouts/MainLayout.vue
View file @ 5b6d4fd0
......@@ -389,7 +389,7 @@ export default {
that.injectTCCC(
r.Data.Token,
1400617921,
this.userInfo.Email,
that.userInfo.Email,
r.Data.SdkURL
);
}
......
src/pages/activity/configurationstudentsList.vue 0 → 100644
View file @ 5b6d4fd0
<template>
<div class="page-body">
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-right-column-table sticky-column-table" separator="none" :data="dataList" :columns="columns"
row-key="name">
<template v-slot:top>
<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)" -->
</div>
</template>
<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">
<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>
<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">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="addObj(props.row)" />
<q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
@click="delQuestion(props.row)" />
</q-td>
</template>
</q-table>
<wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></wenjuan-form>
</div>
</div>
</template>
<script>
import wenjuanForm from '../../components/activity/wenjuan-form'
export default {
meta: {
title: "意见调查表"
},
components: {
wenjuanForm
},
data() {
return {
columns: [
{
name: 'ID',
label: 'ID',
align: 'left',
field: 'ID'
},
{
name: 'Title',
label: '问题名称',
field: 'Title',
align: 'left'
},
{
name: 'FormTypeStr',
label: '问卷类型',
field: 'FormTypeStr',
align: 'left'
},
{
name: 'IsRequired',
label: '是否必填',
field: 'IsRequired',
align: 'left'
},
{
name: 'IsShow',
label: '是否显示',
field: 'IsShow',
align: 'left'
},
{
name: 'Sort',
label: '排序',
field: 'Sort',
align: 'left'
},
{
name: 'optioned',
label: '操作',
field: 'TId'
}
],
dataList: [],
loading: true,
ShowOpts: [{
label: '不限',
value: '-1'
},
{
label: '是',
value: '0'
},
{
label: '否',
value: '1'
}
],
msg:{
pageIndex:1,
pageSize:15,
rowsPerPage: 15,
PrizeType:0,
Title:'',
IsShow:'-1',
SurveyType:0,
ActivitySurveyId:1,//活动id
},
platList:[],
pageCount: 0,
isShowWenjuan: false,
objOption: null,
}
},
created() {
},
mounted() {
if(this.$route.query&&this.$route.query.ID){
this.msg.ActivitySurveyId = this.$route.query.ID;
}
this.getPlat();
this.getList();
},
methods: {
getPlat(){
this.apipostDS("/api/Survey/GetActivitySurveyGuestPage", {}, res => {
if(res.data.resultCode==1){
this.platList = res.data.data;
let obj = {
Id:0,
Name:'不限'
}
this.platList.unshift(obj);
}else {
this.Info(res.data.message);
}
console.log( '数据信息' + res.data)
})
},
resetSearch() {
this.msg.pageIndex = 1;
this.getList();
},
getList(){
this.loading=true;
this.apipostDS("/api/Survey/GetPageList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}else {
this.Info(res.data.message);
}
})
},
addObj(obj) {
if (obj) {
this.objOption = obj
} else {
this.objOption = null
}
this.isShowWenjuan = true;
},
//删除问卷
delQuestion(row){
let that = this;
this.$q.dialog({
title: "提示",
message: '是否删除该活动信息？',
cancel: {
label: "取消",
flat: true
},
ok: {
label: "确认",
flat: true,
focus: true
}
}).onOk(() => {
that.apipostDS(
"/api/Survey/DelSurvey",
{SurveyID:row.ID},
res => {
if (res.data.resultCode == 1) {
that.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '数据删除成功！',
position: 'top'
})
that.getList();
} else {
that.$q.notify({
type: 'negative',
position: "top",
message: res.data.message
})
}
},
);
});
},
closeSaveForm(){
this.isShowWenjuan=false;
},
changePage(val) {
this.msg.pageIndex = val;
this.getList();
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
src/pages/classroom/Scheduling.vue
View file @ 5b6d4fd0
<template>
<div class="page-body room-list" v-loading="loading">
<div v-for="item in classdata" :key="item.Key" class="school-item">
<div class="school-name">{{item.SchoolName}}</div>
<div class="classroom-box">
<div v-for="(_item,_index) in item.RoomList" :key="item.RoomId" >
<div class="classroom-item q-mr-lg q-mb-lg" :class="{'classroom-item-noUse':_item.UserRate==0}" >
<div @click="goUrl(item,_item)">
<div class="divCalssRoom"> <el-image class="classroom-img" :src="_item.RoomPicList[0]" fit="cover" >
<div slot="error" class="image-slot">
<img src="../../assets/images/classroom/bg-img.jpg" alt="" srcset="" style=" opacity: 0.8;">
</div>
</el-image></div>
</div>
<div class="classroom-name" >{{_item.RoomName}}
<!-- <img src="../../assets/images/classroom/warning.png" class="q-ml-sm" v-if="_item.warn">
<img src="../../assets/images/classroom/normal.png" class="q-ml-sm" v-if="!_item.warn"> -->
</div>
<q-knob
show-value
font-size="0.1rem"
v-model="_item.user"
size="50px"
:thickness="0.1"
color="primary"
track-color="grey-3"
class="q-ma-md classroom-user"
readonly
style="text-align: center"
>
{{ _item.UserRate}}%
<br/>
使用率
</q-knob>
<div class="classroom-info">
<div v-if="_item.TimeList.length>0">
<q-carousel
v-model="_item.slide"
animated
:navigation="false"
height="75px"
class=" text-white shadow-1 rounded-borders"
arrows
control-color="grey-1"
control-text-color="primary"
control-type="unelevated"
>
<q-carousel-slide v-for="(slide,slideIndex) in _item.TimeList" :key="slideIndex" :name="slideIndex" >
<div class="info-box">
<div class="time">{{ slide.StartTime }}</div>
<div class="info">{{slide.TeacherName}}：{{slide.ClassName}}</div>
</div>
</q-carousel-slide>
</q-carousel>
</div>
<div v-if="_item.TimeList.length===0" class="no-data">
暂无课程安排
</div>
<div v-for="(item, i) in classdata" :key="item.Key">
<template
v-if="
item.SchoolName.indexOf('武侯') == -1 &&
item.SchoolName.indexOf('眉山') == -1
"
>
<div class="row items-center">
<div class="text-h6 col">{{ item.SchoolName }}</div>
<div v-if="i == 0" class="f12">只看在线：</div>
<div v-if="i == 0">
<el-switch
v-model="queryStatus"
@change="changeViewStatusHandler"
></el-switch>
</div>
</div>
<div class="q-mt-md q-mb-lg row">
<template v-for="(x, xi) in item.RoomList">
<div
class="class-room"
style="width:calc(20% - 10px);margin-right:10px;margin-bottom:10px;"
v-if="queryStatus == 0 || (queryStatus == 1 && x.StatusInfo)"
:key="xi"
>
<div class="img-box">
<q-img
:src="x.RoomPicList[0]"
height="100%"
fit="fill"
spinner-color="primary"
spinner-size="30px"
v-if="x.RoomPicList && x.RoomPicList.length > 0"
/>
<q-img
src="../../assets/images/classroom/bg-img.jpg"
fit="fill"
height="100%"
spinner-color="primary"
spinner-size="30px"
v-else
/>
</div>
<div class="xuhua"></div>
<div class="q-pa-md">
<div class="row items-end">
<div style="font-size:18px;" class="col">
{{ x.RoomName }}
</div>
<div class="f12 q-ml-md text-grey-5">
<div class="text-right">时段</div>
<div class="text-dark">
{{ x.StartTime }} - {{ x.EndTime }}
</div>
</div>
</div>
</div>
<div class="q-mt-lg f12 row items-center">
<div class="text-grey-6 f12 col">
<span
class="q-px-xs text-white q-mr-md inline-block text-weight-bold"
style="border-radius:4px;font-size:15;"
:class="{
'bg-grey-3': !x.StatusInfo,
'bg-negative': x.StatusInfo
}"
>
LIVE
</span>
<span class="text-grey-6" v-if="!x.StatusInfo"
>设备离线</span
>
<span
class="text-grey-6"
v-else-if="x.StatusInfo.UnLockUserName == 'lock'"
>设备在线，未解锁</span
>
<span class="text-grey-6" v-else
>{{ x.StatusInfo.UnLockUserName }}正在使用</span
>
</div>
<div v-if="x.StatusInfo">
<q-btn
color="primary"
dense
class="f12"
flat
label="链接"
@click="openVideo(x)"
/>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
</div>
</template>
</div>
<q-dialog v-model="showVideo" @hide="clearVideo">
<q-card
class="my-card"
style="width:64vw !important;max-width:64vw !important;max-height:32vw !important;height:32vw !important;"
flat
>
<div
id="player-con"
style="width:100%;height:100%;overflow:hidden;"
></div>
</q-card>
</q-dialog>
</div>
</template>
<script>
import {
getUseClassRoomList
} from '../../api/classroom/index';
export default {
meta: {
title: "教室状态"
},
data() {
return {
classdata:[
{
SchoolName:"锦江校区一",
list:[
{
slide:0,
img:"",
classroom:'樱花教室',
user:80,
warn:0,
course:[]
},
]
}
<script>
import { getUseClassRoomList } from "../../api/classroom/index";
import * as signalR from "@aspnet/signalr";
export default {
meta: {
title: "教室状态"
},
data() {
return {
classdata: [],
loading: true,
showVideo: false,
videoObj: null,
currentRoom: null,
queryStatus: 0,
player: null,
connection: "", //signalr连接
roomStatusList: [] //返回消息
};
},
],
loading: true,
};
created() {
let thisVue = this;
console.log(process.env.API_SIG);
this.connection = new signalR.HubConnectionBuilder()
.withUrl(process.env.API_SIG, {
skipNegotiation: true,
transport: signalR.HttpTransportType.WebSockets
})
.configureLogging(signalR.LogLevel.Information)
.build();
this.connection.on("RoomStatusChange", function(message) {
thisVue.roomStatusList = JSON.parse(message);
console.log(thisVue.roomStatusList);
thisVue.changeStatus();
});
this.connection.onclose(async () => {
setTimeout(() => {
thisVue.linkHub();
}, 3000);
});
this.linkHub();
},
mounted() {
this.getList();
//this.openVideo();
},
methods: {
changeViewStatusHandler() {},
clearVideo() {
this.player.stop();
this.player.dispose();
this.showVideo = false;
},
mounted(){
this.getList();
openVideo(item) {
this.showVideo = true;
this.currentRoom = item;
let url = `http://47.96.12.235:5000/live/${item.RoomId}.m3u8`;
this.$nextTick(() => {
this.initPlayer(url);
});
},
methods:{
goUrl(x,y){
this.$router.push({
path:"/classroom/useRecord",
query:{
key:x.Key,
roomId:y.RoomId
}
})
},
getList() {
getUseClassRoomList({}).then(res => {
this.loading = false
if(res.Code===1){
res.Data.forEach(e => {
e.RoomList.forEach(_e=>{
_e.slide=0
})
});
this.classdata=res.Data
}
}).catch(() => {
this.loading = false;
})
initPlayer(url) {
this.player = new Aliplayer(
{
id: "player-con",
source: url,
width: "100%",
height: "100%",
autoplay: true,
isLive: true,
rePlay: false,
playsinline: true,
preload: true,
controlBarVisibility: "hover",
useH5Prism: true
},
}
};
</script>
<style lang="scss" scoped>
.school-item{
margin-bottom: 10px;
.school-name{
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #000000;
margin-bottom: 30px;
}
.classroom-box{
width: 1680px;
display: flex;
// justify-content: space-between;
flex-wrap: wrap;
.classroom-item-noUse{
opacity:0.8;
}
.classroom-item{
width: 390px;
height: 235px;
background: #FFFFFF;
border: 1px solid #EBEBEB;
box-shadow: 0px 1px 1px 0px #E4E7FB;
border-radius: 16px;
position: relative;
overflow: hidden;
.classroom-img{
display: block;
width: 390px;
// height: 160px;
// border-radius: 16px;
background-color: #333;
overflow: hidden;
}
.divCalssRoom{
height: 160px;
border-radius: 16px;
overflow: hidden;
}
.classroom-name{
position: absolute;
top: 20px;
left: 20px;
z-index: 5999;
font-size: 20px;
font-family: PingFang SC;
font-weight: 800;
color: #FFFFFF;
display: flex;
align-items: center;
}
.classroom-user{
position: absolute;
top: 10px;
right: 10px;
z-index: 5999;
color: #FFFFFF;
}
.classroom-info{
width: 390px;
height: 75px;
// background-color: tomato;
.info-box{
height: 43px;
display: flex;
align-items: center;
justify-content: flex-start;
box-sizing: border-box;
padding: 0 40px;
.time{
font-size: 14px;
font-family: PingFang SC;
font-weight: bold;
color: #6D97FF;
margin-right: 10px;
}
.info{
// width: 225px;
height: 100%;
font-size: 14px;
font-family: PingFang SC;
display: flex;
align-items: center;
color: #000000;
}
}
}
function(player) {}
);
},
changeStatus() {
this.initStatus();
if (this.roomStatusList && this.roomStatusList.length > 0) {
this.roomStatusList.forEach(x => {
this.classdata.forEach(y => {
y.RoomList.forEach(z => {
if (z.RoomId == x.RoomId) {
z.StatusInfo = x;
}
});
});
});
}
this.$forceUpdate();
},
initStatus() {
this.classdata.forEach(y => {
y.RoomList.forEach(z => {
this.classdata.forEach(y => {
y.RoomList.forEach(z => {
z.StatusInfo = null;
});
});
});
});
this.$forceUpdate();
},
linkHub() {
let thatVue = this;
this.connection
.start()
.then(() => {
console.log("linke success");
thatVue.connection.invoke("RegistErp", "IMERP");
})
.catch(e => {
console.log(e);
setTimeout(() => {
thatVue.linkHub();
}, 3000);
});
},
goUrl(x, y) {
this.$router.push({
path: "/classroom/useRecord",
query: {
key: x.Key,
roomId: y.RoomId
}
});
},
getList() {
getUseClassRoomList({})
.then(res => {
this.loading = false;
if (res.Code === 1) {
res.Data.forEach(e => {
e.RoomList.forEach(_e => {
_e.slide = 0;
});
});
this.classdata = res.Data;
this.changeStatus();
}
})
.catch(() => {
this.loading = false;
});
}
}
};
</script>
<style>
.class-room {
border: 1px solid #f5f5f5;
border-radius: 10px;
position: relative;
overflow: hidden;
}
.class-room .img-box {
height: 80px;
}
.class-room .xuhua {
position: absolute;
top: 0;
height: 80px;
left: 0;
right: 0;
backdrop-filter: blur(4px);
}
.no-data{
height: 75px;
font-size: 14px;
color: #000000;
display: flex;
justify-content: center;
align-items: center;
.class-room:hover .xuhua {
backdrop-filter: none;
}
.room-list{
overflow: scroll;
.no-data {
height: 75px;
font-size: 14px;
color: #000000;
display: flex;
justify-content: center;
align-items: center;
}
</style>
src/pages/classroom/courseInfo.vue
View file @ 5b6d4fd0
<style scoped>
#player-con{
#player-con {
width: 100%;
height: 500px;
background-color: #eee;
}
.no-video{
.no-video {
width: 800px;
height: 450px;
margin: 0 auto;
background-color: #000;
display: flex;
align-items: center;
justify-content:center;
justify-content: center;
color: #fff;
font-size: 30px;
}
.title{
color: #000000;
font-size: 18px;
font-weight: bold;
margin-bottom: 20px;
}
.scheduInfo {
height: 100%;
width: 100%;
padding: 15px;
background-color: #f2f4f7;
overflow: hidden;
}
.scheduInfo .schedu_left {
width: 248px;
flex: 0 0 auto;
position: relative;
background-image: url(../../assets/images/sched_bg.png);
background-repeat: no-repeat;
background-size: 100% auto;
height: 100%;
}
.scheduInfo .okr-menu-active {
color: var(--q-color-primary);
font-weight: bold;
background: #ecf1ff;
}
.title {
color: #000000;
font-size: 18px;
font-weight: bold;
margin-bottom: 20px;
}
.scheduInfo {
height: 100%;
width: 100%;
padding: 15px;
background-color: #f2f4f7;
overflow: hidden;
}
.mySched {
border-radius: 8px;
overflow: hidden;
height: 100%;
background-color: #fff;
}
.scheduInfo .schedu_left {
width: 248px;
flex: 0 0 auto;
position: relative;
background-image: url(../../assets/images/sched_bg.png);
background-repeat: no-repeat;
background-size: 100% auto;
height: 100%;
}
.schedu_ImgDiv {
width: 68px;
height: 68px;
border-radius: 20px;
overflow: hidden;
margin: 75px auto 0;
}
.scheduInfo .okr-menu-active {
color: var(--q-color-primary);
font-weight: bold;
background: #ecf1ff;
}
.schedu_ImgDiv img {
width: 100%;
height: 100%;
}
.mySched {
border-radius: 8px;
overflow: hidden;
height: 100%;
background-color: #fff;
}
.schedu_Name {
color: #fff;
font-size: 16px;
margin-top: 26px;
text-align: center;
}
.schedu_ImgDiv {
width: 68px;
height: 68px;
border-radius: 20px;
overflow: hidden;
margin: 75px auto 0;
}
.schedu_Status {
font-size: 12px;
color: #fff;
text-align: center;
margin-top: 15px;
}
.schedu_ImgDiv img {
width: 100%;
height: 100%;
}
.schedu_st {
display: inline-block;
width: 10px;
height: 10px;
border-radius: 50%;
margin-right: 5px;
position: relative;
top: 1px;
}
.schedu_Name {
color: #fff;
font-size: 16px;
margin-top: 26px;
text-align: center;
}
.zbz {
background-color: #00DB4E;
}
.schedu_Status {
font-size: 12px;
color: #fff;
text-align: center;
margin-top: 15px;
}
.xxz {
background-color: #DBDBDB;
}
.schedu_st {
display: inline-block;
width: 10px;
height: 10px;
border-radius: 50%;
margin-right: 5px;
position: relative;
top: 1px;
}
.wdk {
background-color: #FE4475;
}
.zbz {
background-color: #00db4e;
}
.clockon_Duty {
width: 120px;
height: 34px;
background: linear-gradient(90deg, #00BDD3, #00D761);
border-radius: 10px;
margin: 100px auto 24px;
text-align: center;
line-height: 31px;
color: #fff;
font-size: 14px;
cursor: pointer;
}
.xxz {
background-color: #dbdbdb;
}
.sche_daka {
font-size: 18px;
position: relative;
left: 5px;
top: 2px;
}
.wdk {
background-color: #fe4475;
}
.schedu_jiaojie {
width: 120px;
height: 34px;
line-height: 34px;
text-align: center;
border-radius: 10px;
border: 1px solid #91AEFF;
color: #C4D4FF;
font-size: 14px;
margin: auto;
cursor: pointer;
}
.clockon_Duty {
width: 120px;
height: 34px;
background: linear-gradient(90deg, #00bdd3, #00d761);
border-radius: 10px;
margin: 100px auto 24px;
text-align: center;
line-height: 31px;
color: #fff;
font-size: 14px;
cursor: pointer;
}
.scheInfo_rightTop {
width: 100%;
/* height: 80px; */
padding: 20px 0;
background-color: #fff;
}
.sche_daka {
font-size: 18px;
position: relative;
left: 5px;
top: 2px;
}
.schScroll {
background-color: #F6F8FA;
}
.schedu_jiaojie {
width: 120px;
height: 34px;
line-height: 34px;
text-align: center;
border-radius: 10px;
border: 1px solid #91aeff;
color: #c4d4ff;
font-size: 14px;
margin: auto;
cursor: pointer;
}
.scheInfo_Topflex {
display: flex;
/* width: 90%; */
/* height: 80px; */
align-items: center;
}
.scheInfo_rightTop {
width: 100%;
/* height: 80px; */
padding: 20px 0;
background-color: #fff;
}
.Sctop_Color {
font-size: 18px;
color: #000000;
width: 246px;
text-align: center;
}
.schScroll {
background-color: #f6f8fa;
}
.Scotop_little {
color: #AAAAAA;
font-size: 14px;
margin-right: 15px;
display: inline-block;
text-align: right;
width: 60px;
}
.scheInfo_Topflex {
display: flex;
/* width: 90%; */
/* height: 80px; */
align-items: center;
}
.Scdu_benci::after {
content: "";
position: absolute;
height: 29px;
width: 2px;
background: #EBEBEB;
right: 0;
}
.Sctop_Color {
font-size: 18px;
color: #000000;
width: 246px;
text-align: center;
}
.sche_mid {
display: flex;
width: 100%;
justify-content: space-between;
}
.Scotop_little {
color: #aaaaaa;
font-size: 14px;
margin-right: 15px;
display: inline-block;
text-align: right;
width: 60px;
}
.sche_midList {
width: 31.6%;
height: 300px;
background: #fff;
border-radius: 16px;
border: 1px solid #EBEBEB;
box-shadow: 0px 1px 1px 0px #E4E7FB;
overflow: hidden;
font-family: 'MicrosoftYaHei';
position: relative;
}
.Scdu_benci::after {
content: "";
position: absolute;
height: 29px;
width: 2px;
background: #ebebeb;
right: 0;
}
.Sche_Bottom {
margin: 26px 40px 0 40px;
}
.sche_mid {
display: flex;
width: 100%;
justify-content: space-between;
}
.scheList_TOP {
width: 100%;
height: 107px;
border-radius: 16px;
overflow: hidden;
position: relative;
}
.sche_midList {
width: 31.6%;
height: 300px;
background: #fff;
border-radius: 16px;
border: 1px solid #ebebeb;
box-shadow: 0px 1px 1px 0px #e4e7fb;
overflow: hidden;
font-family: "MicrosoftYaHei";
position: relative;
}
.scheList_TOP img {
width: 100%;
height: 100%;
}
.Sche_Bottom {
margin: 26px 40px 0 40px;
}
.word_sche {
color: #fff;
font-size: 20px;
position: absolute;
top: 25px;
left: 32px;
}
.scheList_TOP {
width: 100%;
height: 107px;
border-radius: 16px;
overflow: hidden;
position: relative;
}
.word_scheNumber {
display: inline-block;
width: 36px;
height: 36px;
color: #fff;
background-color: #FE4475;
position: absolute;
top: 30px;
left: 130px;
text-align: center;
line-height: 36px;
border-radius: 8px;
font-size: 25px;
}
.scheList_TOP img {
width: 100%;
height: 100%;
}
.scheList_Bottom {
font-size: 14px;
color: #000000;
height: 46px;
padding-bottom: 10px;
border-bottom: 1px solid #F3F3F3;
}
.word_sche {
color: #fff;
font-size: 20px;
position: absolute;
top: 25px;
left: 32px;
}
.sche_Dian {
display: inline-block;
width: 6px;
height: 6px;
background-color: #6D97FF;
border-radius: 50%;
margin-right: 10px;
}
.word_scheNumber {
display: inline-block;
width: 36px;
height: 36px;
color: #fff;
background-color: #fe4475;
position: absolute;
top: 30px;
left: 130px;
text-align: center;
line-height: 36px;
border-radius: 8px;
font-size: 25px;
}
.schScroll::-webkit-scrollbar {
display: none;
}
.scheList_Bottom {
font-size: 14px;
color: #000000;
height: 46px;
padding-bottom: 10px;
border-bottom: 1px solid #f3f3f3;
}
.Sch_MainColor {
font-size: 18px;
color: #000000;
.sche_Dian {
display: inline-block;
width: 6px;
height: 6px;
background-color: #6d97ff;
border-radius: 50%;
margin-right: 10px;
}
}
.schScroll::-webkit-scrollbar {
display: none;
}
.Sch_MainColor {
font-size: 18px;
color: #000000;
}
</style>
<template>
......@@ -270,90 +268,90 @@
<div class="col scroll schScroll">
<schedulHead :dataList="dataList"></schedulHead>
<div class="Sche_Bottom">
<div class="title">课程录像</div>
<div class="no-video" v-if="!dataList.VideoUrl">暂无视频</div>
<div id="player-con" v-if="dataList.VideoUrl"></div>
<schedulVisit :tabledata="dataList.GuestList"></schedulVisit>
<div class="title">课程录像</div>
<div class="no-video" v-if="!dataList.VideoUrl">暂无视频</div>
<div id="player-con" v-if="dataList.VideoUrl"></div>
<schedulVisit :tabledata="dataList.GuestList"></schedulVisit>
</div>
</div>
</div>
</div>
</template>
<script>
import {getTimeDetail} from '../../api/classroom/index'
import {getVideoPlayAuth,getVideoPlayUrl} from '../../api/classroom/video'
import schedulVisit from './components/schedul-visit'
import schedulHead from './components/schedul-head'
export default {
props: {},
components: {
schedulVisit,
schedulHead,
},
data() {
return {
dataList: {},
player:null,
}
import { getTimeDetail } from "../../api/classroom/index";
import { getVideoPlayAuth, getVideoPlayUrl } from "../../api/classroom/video";
import schedulVisit from "./components/schedul-visit";
import schedulHead from "./components/schedul-head";
export default {
props: {},
components: {
schedulVisit,
schedulHead
},
data() {
return {
dataList: {},
player: null
};
},
created() {
if (this.$route.query.id) {
this.id = this.$route.query.id;
}
},
mounted() {
this.getdata();
},
methods: {
getdata() {
getTimeDetail({ ID: this.id }).then(res => {
if (res.Code === 1) {
this.dataList = res.Data;
if (res.Data.VideoUrl) {
this.getAuth(res.Data.VideoUrl);
// this.$nextTick(() => {
// this.initPlayer(res.Data.VideoUrl);
// });
}
}
});
},
created() {
if (this.$route.query.id) {
this.id = this.$route.query.id;
}
//初始化视频播放器
initPlayer(url, cover, auth) {
this.player = new Aliplayer(
{
id: "player-con",
source: url,
width: "100%",
height: "500px",
autoplay: false,
isLive: false,
rePlay: false,
playsinline: true,
preload: true,
controlBarVisibility: "hover",
useH5Prism: true,
cover: cover,
playauth: auth
},
function(player) {}
);
},
mounted(){
this.getdata();
getAuth(url) {
getVideoPlayAuth({ strVid: url }).then(res => {
if (res.Code === 1 && res.Data.PlayAuth) {
this.getUrl(url, res.Data.PlayAuth);
}
});
},
methods: {
getdata(){
getTimeDetail({ID:this.id}).then(res=>{
if(res.Code===1){
this.dataList=res.Data
if(res.Data.VideoUrl){
this.getAuth(res.Data.VideoUrl)
}
}
})
},
//初始化视频播放器
initPlayer(url,cover,auth){
this.player = new Aliplayer({
"id": "player-con",
"source": url,
"width": "100%",
"height": "500px",
"autoplay": true,
"isLive": false,
"rePlay": false,
"playsinline": true,
"preload": true,
"controlBarVisibility": "hover",
"useH5Prism": true,
"cover":cover,
"playauth":auth,
}, function (player) {
}
);
},
getAuth(url){
getVideoPlayAuth({strVid:url}).then(res=>{
if(res.Code===1&&res.Data.PlayAuth){
this.getUrl(url,res.Data.PlayAuth)
}
})
},
getUrl(url,auth){
getVideoPlayUrl({strVid:url}).then(res=>{
if(res.Code===1){
this.initPlayer(res.Data.URL,res.Data.VideoImg,auth)
}
})
}
},
}
getUrl(url, auth) {
getVideoPlayUrl({ strVid: url }).then(res => {
if (res.Code === 1) {
this.initPlayer(res.Data.URL, res.Data.VideoImg, auth);
}
});
}
}
};
</script>
src/pages/financial/returnPassbook/ReturnUserList.vue
View file @ 5b6d4fd0
......@@ -154,6 +154,9 @@
import {
EduDownLoad
} from "../../../api/common/common";
import {
mapState
} from "vuex";
export default {
meta: {
title: "销售提成详情"
......@@ -169,7 +172,7 @@
SchoolId: '-1',
Status: '-2',
OrderSourceType: '-1',
OrderSourceId: 0,
OrderSourceId: '',
Q_SelectNormal: '2',
UserDept: "",
},
......@@ -207,6 +210,21 @@
DepartmentList: [], //部门列表
}
},
computed: mapState({
//是否有下载权限
isReturnperiods(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "Edit_Returnperiods") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
created() {
this.getCustomFrom();
this.queryDeptList();
......@@ -214,6 +232,9 @@
this.getStudentDorpDown()
this.GetCustomerList()
this.getStudentList(); //学员下拉
if(! this.isReturnperiods){
this.msg.OrderSourceType = 2;
}
},
mounted() {
if (this.$route.query && this.$route.query.id) {
......@@ -289,8 +310,19 @@
Name: '不限',
Id: '-1'
}
this.customFromList = res.Data;
this.customFromList.unshift(obj);
if(this.isReturnperiods){
this.customFromList = res.Data;
this.customFromList.unshift(obj);
}else{
res.Data.forEach(data=>{
if(data.Id ==2){
this.customFromList.push(data);
}
})
}
}
})
},
......
src/pages/financial/returnPassbook/ReturnperiodsList.vue
View file @ 5b6d4fd0
......@@ -42,7 +42,6 @@
.el-table th {
padding: 5px 0;
}
</style>
<template>
<div class="page-body ReturnperiodsList">
......@@ -56,7 +55,7 @@
</el-date-picker>
</div>
<div>
<q-btn v-if='isgenerate==true' :loading="loading1"  color="primary"  size="11px"  label="生成返佣"
<q-btn v-if='isReturnperiods' :loading="loading1"  color="primary"  size="11px"  label="生成返佣"
 @click="scCommission"  style="height:28px" />
<div style="font-size: 11px;color: #666;">*默认生成上月返佣</div>
</div>
......@@ -66,18 +65,20 @@
<template>
<el-table ref="filterTable" :data="tableData" v-loading='loading'
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
<el-table-column prop="BatchName" label="周期"></el-table-column>
<el-table-column prop="TotalMoney" label="累计金额"> </el-table-column>
<el-table-column prop="TotalEmployee" label="个人直客累计金额"> </el-table-column>
<el-table-column v-if="isReturnperiods" prop="TotalMoney" label="累计金额"> </el-table-column>
<el-table-column v-if="isReturnperiods" prop="TotalEmployee" label="个人直客累计金额"> </el-table-column>
<el-table-column prop="TotalCustomer" label="同业录入累计金额"> </el-table-column>
<el-table-column prop="TotalInternal" label="内部介绍累计金额"> </el-table-column>
<el-table-column prop="TotalTrans" label="学员转介绍累计金额"> </el-table-column>
<el-table-column prop="CreateByName" label="创建人"> </el-table-column>
<el-table-column prop="CreateDate" label="创建时间"> </el-table-column>
<el-table-column label="财务单据">
<el-table-column v-if="isReturnperiods" prop="TotalInternal" label="内部介绍累计金额"> </el-table-column>
<el-table-column v-if="isReturnperiods" prop="TotalTrans" label="学员转介绍累计金额"> </el-table-column>
<el-table-column v-if="isReturnperiods" prop="CreateByName" label="创建人"> </el-table-column>
<el-table-column v-if="isReturnperiods" prop="CreateDate" label="创建时间"> </el-table-column>
<el-table-column v-if="isReturnperiods" label="财务单据">
<template slot-scope="scope">
<template v-if="scope.row.FinanceIdList" v-for="item in scope.row.FinanceIdList">
<a @click="goDetails(item)" style="cursor:pointer;color:blue;text-decoration:underline;display:inline-block;margin-right:10px;">{{item}}</a>
<a @click="goDetails(item)"
style="cursor:pointer;color:blue;text-decoration:underline;display:inline-block;margin-right:10px;">{{item}}</a>
</template>
</template>
</el-table-column>
......@@ -87,10 +88,13 @@
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''||scope.row.FinanceIds==null"
content="生成财务单据" placement="top">
<i class="iconfont icon-add" @click="setCommissionFinanace(scope.row.Id)"></i>
</el-tooltip>
<templat v-if="isReturnperiods">
<el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''||scope.row.FinanceIds==null"
content="生成财务单据" placement="top">
<i class="iconfont icon-add" @click="setCommissionFinanace(scope.row.Id)"></i>
</el-tooltip>
</templat>
</div>
</template>
</el-table-column>
......@@ -116,6 +120,9 @@
getSellAchievementsSendEmployeeList,
setSellAchievementsSendEmployee
} from '../../../api/finance/index'
import {
mapState
} from "vuex";
export default {
meta: {
title: "返佣期数列表"
......@@ -158,6 +165,21 @@
CheckID: 0,
}
},
computed: mapState({
//是否有下载权限
isReturnperiods(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "Edit_Returnperiods") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
created() {
let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x => { //判断权限
......@@ -207,13 +229,13 @@
SetCommissionPeriodsFinanace(this.msgFinance).then(res => {
if (res.Code == 1) {
this.getList();
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: res.Message,
position: 'top'
})
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: res.Message,
position: 'top'
})
}
this.loading1 = false;
}).catch(err => {
......@@ -275,9 +297,7 @@
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
</style>
\ No newline at end of file
src/pages/financial/returnPassbook/returnpassbookStatistics.vue
View file @ 5b6d4fd0
<style>
.baseSet_Title {
.baseSet_Title {
width: 120px !important;
padding: 18px 0 0 16px;
text-align: right;
}
.cycleOrderList .border-bottom {
/* border-bottom: 1px dashed #EEE; */
}
.cycleOrderList .border-bottom {
padding-bottom: 5px;
margin-bottom: 5px;
}
.cycleOrderList .text-bottom {
}
.cycleOrderList .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
}
.cycleOrderList ._icon_btn i.icon-sousuo {
}
.cycleOrderList ._icon_btn i.icon-sousuo {
background-color: #47bf8c;
}
.cycleOrderList ._icon_btn i {
}
.cycleOrderList ._icon_btn i {
width: 30px;
height: 30px;
display: inline-block;
......@@ -28,696 +32,541 @@
margin-right: 10px;
cursor: pointer;
outline: none;
}
.cycleOrderList .el-table td,
.el-table th {
}
.cycleOrderList .el-table td,
.el-table th {
padding: 5px 0;
}
}
</style>
<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">
<!-- <div class="col-3">
<q-select
filled
stack-label
@input="resetSearch()"
option-value="SId"
option-label="SName"
v-model="msg.SchoolId"
ref="SchoolId"
:options="schoolList"
label="校区"
dense
emit-value
map-options
/>
</div> -->
<q-select
v-if="!isNormal"
@input="resetSearch"
filled
stack-label
option-value="Id"
option-label="Name"
use-input
v-model="msg.Status"
:options="StatusList"
label="状态"
dense
class="col-3"
emit-value
map-options
></q-select>
<div class="col-3" v-if="!isNormal">
<q-select
filled
stack-label
@input="resetSearch()"
option-value="Id"
option-label="BatchName"
v-model="msg.BatchId"
:options="PeriodsList"
label="周期"
dense
emit-value
map-options
/>
</div>
<div class="col-3">
<q-select
filled
stack-label
use-input
input-debounce="0"
option-value="ClassId"
@input="getList"
option-label="ClassName"
v-model="msg.ClassId"
:options="ClassList"
label="班级"
dense
emit-value
map-options
@filter="filterFnbanji"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<q-select
v-if="!isNormal"
@input="resetSearch"
filled
stack-label
option-value="Id"
option-label="Name"
use-input
v-model="msg.CommissionType"
:options="CommissionList"
label="类型"
dense
class="col-3"
emit-value
map-options
></q-select>
<q-select
v-if="!isNormal"
@input="resetSearch"
filled
stack-label
option-value="Id"
option-label="Name"
use-input
v-model="msg.Q_SelectNormal"
:options="SelectNormal"
label="返佣情况"
dense
class="col-3"
emit-value
map-options
></q-select>
<q-select
class="col-3"
filled
stack-label
input-debounce="0"
v-if="!isEdit"
option-value="Id"
@input="getlaiyuan"
option-label="Name"
v-model="msg.OrderSourceType"
:options="customFromList"
label="来源"
dense
emit-value
map-options
></q-select>
<div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3">
<q-select
filled
clearable
stack-label
v-model="msg.OrderSourceId"
dense
:options="myEmployeeList"
use-input
@input="getList"
label="人员"
@filter="filterEmployee"
option-label="EmployeeName"
option-value="Id"
emit-value
map-options
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 2">
<q-select
filled
clearable
stack-label
v-model="msg.OrderSourceId"
dense
:options="customList"
use-input
@input="getList"
label="关联同行"
@filter="filterFn"
option-label="CustomerName"
option-value="CustomerId"
emit-value
map-options
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 4">
<q-select
filled
clearable
stack-label
v-model="msg.OrderSourceId"
dense
:options="InvitationList"
use-input
@input="getList"
label="转介人"
@filter="filterFnStudent"
option-label="StuName"
option-value="StuId"
emit-value
map-options
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3">
<q-input
filled
dense
v-model="msg.OrderId"
@keyup.enter.native="resetSearch()"
label="订单号"
/>
</div>
</div>
<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">
<q-select v-if="!isNormal" @input="resetSearch" filled stack-label option-value="Id" option-label="Name"
use-input v-model="msg.Status" :options="StatusList" label="状态" dense class="col-3" emit-value map-options>
</q-select>
<div class="col-3" v-if="!isNormal">
<q-select filled stack-label @input="resetSearch()" option-value="Id" option-label="BatchName"
v-model="msg.BatchId" :options="PeriodsList" label="周期" dense emit-value map-options />
</div>
<div class="page-search row items-center" style="justify-content: space-between;">
<span style="font-size: 20px;font-weight: 400;">
提成统计
<span style="font-size: 16px;">（提成总计:{{ TotalCommission }}）</span>
</span>
<q-btn
v-if="!isNormal"
color="primary"
size="11px"
label="导出"
@click="tcexport"
style="margin-left:10px"
/>
<div class="col-3">
<q-select filled stack-label use-input input-debounce="0" option-value="ClassId" @input="getList"
option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" dense emit-value map-options
@filter="filterFnbanji">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<template>
<el-table
ref="filterTable"
:data="tableData"
v-loading="loading"
:header-cell-style="{ backgroundColor: '#f5f6f7', color: '#a8a8b3' }"
border
style="width: 100%"
>
<el-table-column prop="SchoolName" label="校区" width="150"></el-table-column>
<el-table-column prop="OrderSourceTypeName" label="来源"></el-table-column>
<el-table-column prop="UserName" label="人员"></el-table-column>
<!-- <el-table-column prop="ClassNo" label="班号"></el-table-column> -->
<el-table-column width="170" prop="ClassName" label="班级信息">
<template slot-scope="scope">
<div>
<span
style="cursor: pointer;text-decoration: underline;"
@click="goUrlclass('/course/classManage', scope.row.ClassName)"
>{{ scope.row.ClassName }}</span>
</div>
<div>班号:{{ scope.row.ClassNo }}</div>
</template>
</el-table-column>
<el-table-column prop="OrderId" label="订单号">
<template slot-scope="scope">
<div
style="cursor: pointer;text-decoration: underline;"
@click="goUrlorderList('/sale/orderStatistics', scope.row)"
>{{ scope.row.OrderId }}</div>
</template>
</el-table-column>
<el-table-column prop="StuName" label="学生"></el-table-column>
<el-table-column prop="CommissionType" label="类型">
<template slot-scope="scope">
<span v-if="scope.row.CommissionType == 1">返佣</span>
<span v-if="scope.row.CommissionType == 2">幸福存折</span>
</template>
</el-table-column>
<el-table-column width="130" prop="CommissionMoeny" label="返佣/存折金额">
<template slot-scope="scope">
<div>{{ scope.row.CommissionMoeny ? scope.row.CommissionMoeny : '-' }}</div>
</template>
</el-table-column>
<el-table-column prop="Status" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.Status == -1">不返佣</span>
<span v-if="scope.row.Status == 0">待返佣</span>
<span v-if="scope.row.Status == 1">已返佣到账户</span>
<span v-if="scope.row.Status == 2">佣金已提现</span>
</template>
</el-table-column>
<el-table-column prop="BatchName" label="期数"></el-table-column>
<el-table-column prop="Remark" width="200" label="备注"></el-table-column>
</el-table>
<div style="margin-top: 10px;text-align: center;">
<el-pagination
background
@current-change="handleCurrentChanges"
layout="total,prev, pager, next, jumper"
:current-page.sync="msg.PageIndex"
:page-size="msg.PageSize"
:total="total"
></el-pagination>
</div>
<template v-if="isReturnperiods">
<q-select v-if="!isNormal" @input="resetSearch" filled stack-label option-value="Id" option-label="Name"
use-input v-model="msg.CommissionType" :options="CommissionList" label="类型" dense class="col-3" emit-value
map-options></q-select>
<q-select v-if="!isNormal" @input="resetSearch" filled stack-label option-value="Id" option-label="Name"
use-input v-model="msg.Q_SelectNormal" :options="SelectNormal" label="返佣情况" dense class="col-3" emit-value
map-options></q-select>
<q-select class="col-3" filled stack-label input-debounce="0" v-if="!isEdit" option-value="Id"
@input="getlaiyuan" option-label="Name" v-model="msg.OrderSourceType" :options="customFromList" label="来源"
dense emit-value map-options></q-select>
<div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3">
<q-select filled clearable stack-label v-model="msg.OrderSourceId" dense :options="myEmployeeList" use-input
@input="getList" label="人员" @filter="filterEmployee" option-label="EmployeeName" option-value="Id"
emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 2">
<q-select filled clearable stack-label v-model="msg.OrderSourceId" dense :options="customList" use-input
@input="getList" label="关联同行" @filter="filterFn" option-label="CustomerName" option-value="CustomerId"
emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 4">
<q-select filled clearable stack-label v-model="msg.OrderSourceId" dense :options="InvitationList" use-input
@input="getList" label="转介人" @filter="filterFnStudent" option-label="StuName" option-value="StuId"
emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3">
<q-input filled dense v-model="msg.OrderId" @keyup.enter.native="resetSearch()" label="订单号" />
</div>
</template>
</div>
</div>
<div class="page-search row items-center" style="justify-content: space-between;">
<span style="font-size: 20px;font-weight: 400;">
提成统计
<span style="font-size: 16px;">（提成总计:{{ TotalCommission }}）</span>
</span>
<q-btn v-if="!isNormal" color="primary" size="11px" label="导出" @click="tcexport" style="margin-left:10px" />
</div>
<template>
<el-table ref="filterTable" :data="tableData" v-loading="loading"
:header-cell-style="{ backgroundColor: '#f5f6f7', color: '#a8a8b3' }" border style="width: 100%">
<el-table-column prop="SchoolName" label="校区" width="150"></el-table-column>
<el-table-column prop="OrderSourceTypeName" label="来源"></el-table-column>
<el-table-column prop="UserName" label="人员"></el-table-column>
<el-table-column width="170" prop="ClassName" label="班级信息">
<template slot-scope="scope">
<div>
<span style="cursor: pointer;text-decoration: underline;"
@click="goUrlclass('/course/classManage', scope.row.ClassName)">{{ scope.row.ClassName }}</span>
</div>
<div>班号:{{ scope.row.ClassNo }}</div>
</template>
</el-table-column>
<el-table-column prop="OrderId" label="订单号">
<template slot-scope="scope">
<div v-if="scope.row.OrderType == 1" style="cursor: pointer;text-decoration: underline;"
@click="goUrlorderList('/sale/orderStatistics', scope.row)">{{ scope.row.OrderId }}</div>
<div v-else-if="scope.row.OrderType == 2" style="cursor: pointer;text-decoration: underline;"
@click="goUrlorderList('/sale/studyOrderStatistics', scope.row)">{{ scope.row.OrderId }}</div>
</template>
</el-table-column>
<el-table-column prop="StuName" label="学生"></el-table-column>
<el-table-column prop="CommissionType" label="类型">
<template slot-scope="scope">
<span v-if="scope.row.CommissionType == 1">返佣</span>
<span v-if="scope.row.CommissionType == 2">幸福存折</span>
</template>
</el-table-column>
<el-table-column width="130" prop="CommissionMoeny" label="返佣/存折金额">
<template slot-scope="scope">
<div>{{ scope.row.CommissionMoeny ? scope.row.CommissionMoeny : '-' }}</div>
</template>
</el-table-column>
<el-table-column prop="Status" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.Status == -1">不返佣</span>
<span v-if="scope.row.Status == 0">待返佣</span>
<span v-if="scope.row.Status == 1">已返佣到账户</span>
<span v-if="scope.row.Status == 2">佣金已提现</span>
</template>
</el-table-column>
<el-table-column prop="BatchName" label="期数"></el-table-column>
<el-table-column prop="Remark" width="200" label="备注"></el-table-column>
</el-table>
<div style="margin-top: 10px;text-align: center;">
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper"
:current-page.sync="msg.PageIndex" :page-size="msg.PageSize" :total="total"></el-pagination>
</div>
</template>
</div>
</template>
<script>
import {
<script>
import {
getSchoolDropdown,
getClassDropDownList,
getStudentDorpDownList
} from '../../../api/school/index'
import {
} from '../../../api/school/index'
import {
queryEmployee
} from '../../../api/users/user'
import {
} from '../../../api/users/user'
import {
GetStudentList,
} from '../../../api/course/class';
import {
} from '../../../api/course/class';
import {
CreateTypeList,
GetCustomerList
} from '../../../api/sale/sale'
import {
} from '../../../api/sale/sale'
import {
getCommissionStatistics,
getCommissionPeriodsList,
} from '../../../api/finance/index'
import {
} from '../../../api/finance/index'
import {
EduDownLoad,
} from '../../../api/common/common';
export default {
} from '../../../api/common/common';
import {
mapState
} from "vuex";
export default {
meta: {
title: "业绩提成统计"
title: "业绩提成统计"
},
props: {},
components: {
},
components: {},
data() {
return {
loading: false,
//列表数据参数
msg: {
PageIndex: 1,
PageSize: 10,
SchoolId: '-1',
BatchId: '0',
Status: '-2',
OrderSourceType: '-1',
OrderSourceId: 0,
Q_SelectNormal: '-1',
CommissionType: '-1',
ClassId: 0,
OrderId: '',
UnionCashOutId:0,
},
StatusList: [
{ Id: '-2', Name: '不限' }, { Id: '-1', Name: '不返佣' }, { Id: '0', Name: '待返佣' }, { Id: '1', Name: '已返佣到账户' }, { Id: '2', Name: '佣金已提现' },
],
SelectNormal: [
{ Id: '-1', Name: '不限' }, { Id: '1', Name: '非不返佣的' }, { Id: '2', Name: '已返佣' },
],
CommissionList: [
{ Id: '-1', Name: '不限' }, { Id: '1', Name: '返佣' }, { Id: '2', Name: '幸福存折' },
],
pageCount: 0,
listData: {},
tableData: [],
total: 0,
company: [],
department: [],
ClassList: [],
allClassList: [],
returnString: [], //默认岗位
see_tcdetailed: false,
schoolList: [],
DeptList: [], // 部门下拉
PeriodsList: [],//周期列表
TotalCommission: 0,
ChangeLog: '',
customFromList: [],
TransListData: [], //转介人数据
MyTransListData: [],
customList: [], //同行列表
allCustomList: [], //所有同行列表
InvitationList: [], //学员下拉数据
AllInvitationList: [],
isNormal: false,
employeeList:[],
myEmployeeList:[],
isEdit:false
}
return {
loading: false,
//列表数据参数
msg: {
PageIndex: 1,
PageSize: 10,
SchoolId: '-1',
BatchId: '0',
Status: '-2',
OrderSourceType: '-1',
OrderSourceId: 0,
Q_SelectNormal: '-1',
CommissionType: '-1',
ClassId: 0,
OrderId: '',
UnionCashOutId: 0,
},
StatusList: [{
Id: '-2',
Name: '不限'
}, {
Id: '-1',
Name: '不返佣'
}, {
Id: '0',
Name: '待返佣'
}, {
Id: '1',
Name: '已返佣到账户'
}, {
Id: '2',
Name: '佣金已提现'
}, ],
SelectNormal: [{
Id: '-1',
Name: '不限'
}, {
Id: '1',
Name: '非不返佣的'
}, {
Id: '2',
Name: '已返佣'
}, ],
CommissionList: [{
Id: '-1',
Name: '不限'
}, {
Id: '1',
Name: '返佣'
}, {
Id: '2',
Name: '幸福存折'
}, ],
pageCount: 0,
listData: {},
tableData: [],
total: 0,
company: [],
department: [],
ClassList: [],
allClassList: [],
returnString: [], //默认岗位
see_tcdetailed: false,
schoolList: [],
DeptList: [], // 部门下拉
PeriodsList: [], //周期列表
TotalCommission: 0,
ChangeLog: '',
customFromList: [],
TransListData: [], //转介人数据
MyTransListData: [],
customList: [], //同行列表
allCustomList: [], //所有同行列表
InvitationList: [], //学员下拉数据
AllInvitationList: [],
isNormal: false,
employeeList: [],
myEmployeeList: [],
isEdit: false
}
},
created() {
let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x => {//判断权限
if (x.FunctionCode == "see_tcdetailed") {//判断是否可以查看其他明细
this.see_tcdetailed = true;
computed: mapState({
//是否有下载权限
isReturnperiods(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "Edit_Returnperiods") {
return x;
}
})
if (this.see_tcdetailed == false) {
this.msg.UserId = userinfo.Id
});
return action && action.FunctionCode;
}
return false;
}
}),
created() {
let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x => { //判断权限
if (x.FunctionCode == "see_tcdetailed") { //判断是否可以查看其他明细
this.see_tcdetailed = true;
}
})
if (this.see_tcdetailed == false) {
this.msg.UserId = userinfo.Id
}
},
mounted() {
if (this.$route.query && this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
}
if (this.$route.query && this.$route.query.preriodId) {
this.msg.BatchId = (this.$route.query.preriodId).toString()
}
if (this.$route.query && this.$route.query.UnionCashOutId) {//提现ID
this.msg.UnionCashOutId = this.$route.query.UnionCashOutId
}
if (this.$route.query && this.$route.query.OrderSourceType) {//来源
this.msg.OrderSourceType = this.$route.query.OrderSourceType
}
if (this.$route.query && this.$route.query.OrderSourceId) {//人员ID
this.msg.OrderSourceId = parseInt(this.$route.query.OrderSourceId)
}
if (this.$route.query && this.$route.query.CommissionType) {
this.msg.CommissionType = this.$route.query.CommissionType;
this.msg.Q_SelectNormal = 2
this.isNormal = true
}
if (this.$route.query && this.$route.query.iSFromDash==1){
this.isEdit=true;
if (this.$route.query && this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
}
if (this.$route.query && this.$route.query.preriodId) {
this.msg.BatchId = (this.$route.query.preriodId).toString()
}
if (this.$route.query && this.$route.query.UnionCashOutId) { //提现ID
this.msg.UnionCashOutId = this.$route.query.UnionCashOutId
}
if (this.$route.query && this.$route.query.OrderSourceType) { //来源
this.msg.OrderSourceType = parseInt(this.$route.query.OrderSourceType)
}
if (this.$route.query && this.$route.query.OrderSourceId) { //人员ID
this.msg.OrderSourceId = parseInt(this.$route.query.OrderSourceId)
}
if (this.$route.query && this.$route.query.CommissionType) {
this.msg.CommissionType = parseInt(this.$route.query.CommissionType);
this.msg.Q_SelectNormal = 2
this.isNormal = true
}
if (this.$route.query && this.$route.query.iSFromDash == 1) {
this.isEdit = true;
}
if (this.$route.query && this.$route.query.Status) {
this.msg.Status = this.$route.query.Status;
this.isNormal = false;
this.msg.Q_SelectNormal = '-1'
}
this.getList()
this.setClass()
this.getBranchList()
this.getPeriodList()
this.getCustomFrom() //来源
this.getEmployeeList()
this.getStudentDorpDown()
this.GetCustomerList()
this.getStudentList(); //学员下拉
},
methods: {
resetSearch() {
this.msg.PageIndex = 1;
this.getList()
},
getList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderSourceId == '' || msg.OrderSourceId == null) {
msg.OrderSourceId = 0
}
if (this.$route.query && this.$route.query.Status) {
this.msg.Status = this.$route.query.Status;
this.isNormal = false;
this.msg.Q_SelectNormal = '-1'
getCommissionStatistics(this.msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data.PageData.List
this.TotalCommission = res.Data.PageData.TotalCommission
this.total = res.Data.Count
}
})
},
unique(arr, Name) { //数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
getlaiyuan() {
if (this.msg.OrderSourceType == -1) {
this.msg.OrderSourceId = 0
} else {
this.msg.OrderSourceId = ''
}
this.getList()
this.setClass()
this.getBranchList()
this.getPeriodList()
this.getCustomFrom()//来源
this.getEmployeeList()
this.getStudentDorpDown()
this.GetCustomerList()
this.getStudentList();//学员下拉
},
methods: {
resetSearch() {
this.msg.PageIndex = 1;
this.getList()
},
getList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderSourceId == '' || msg.OrderSourceId == null) {
msg.OrderSourceId = 0
},
//获取客户来源
getCustomFrom() {
CreateTypeList({}).then(res => {
if (res.Code == 1) {
let obj = {
Name: '不限',
Id: '-1'
}
getCommissionStatistics(this.msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data.PageData.List
this.TotalCommission = res.Data.PageData.TotalCommission
this.total = res.Data.Count
}
})
},
unique(arr, Name) {//数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
this.customFromList = res.Data;
this.customFromList.unshift(obj);
}
})
},
//筛选转介人
filterStudent(val, update, abort) {
update(() => {
this.MyTransListData = this.TransListData.filter(
v => v.StuName.indexOf(val) > -1
);
});
},
//筛选员工
filterEmployee(val, update, abort) {
update(() => {
if (val === '') {
this.myEmployeeList = this.employeeList
} else {
const needle = val.toLowerCase();
this.myEmployeeList = this.employeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1);
}
})
},
//获取员工列表
getEmployeeList() {
queryEmployee({
IsLeave: 1
}).then(res => {
this.employeeList = res.Data;
this.myEmployeeList = res.Data;
})
},
//获取转介人下拉
getStudentDorpDown() {
getStudentDorpDownList().then(res => {
if (res.Code == 1) {
this.TransListData = res.Data;
this.MyTransListData = res.Data;
}
})
},
//获取客户下拉数据
GetCustomerList() {
let msg = {
QCreateBy: 0
}
GetCustomerList(msg).then(res => {
if (res.Code == 1) {
this.customList = res.Data;
this.allCustomList = res.Data;
}
})
},
//筛选客户
filterFn(val, update) {
update(() => {
if (val === "") {
this.customList = JSON.parse(JSON.stringify(this.allCustomList));
} else {
const needle = val.toLowerCase();
this.customList = this.allCustomList.filter(
(v) => v.CustomerName.toLowerCase().indexOf(needle) > -1
);
},
getlaiyuan() {
if (this.msg.OrderSourceType == -1) {
this.msg.OrderSourceId = 0
} else {
this.msg.OrderSourceId = ''
}
});
},
handleCurrentChanges(val) {
this.msg.PageIndex = val;
this.getList()
},
//选择班级
setClass(item) {
this.isShowClass = true;
getClassDropDownList({
CourseId: 0,
IsAddDefault: 1, //添加默认选项
}).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
let obj = {
ClassId: 0,
ClassName: '不限'
}
this.getList()
},
//获取客户来源
getCustomFrom() {
CreateTypeList({}).then(res => {
if (res.Code == 1) {
let obj = {
Name: '不限',
Id: '-1'
}
this.customFromList = res.Data;
this.customFromList.unshift(obj);
}
})
},
//筛选转介人
filterStudent(val, update, abort) {
update(() => {
this.MyTransListData = this.TransListData.filter(
v => v.StuName.indexOf(val) > -1
);
});
},
//筛选员工
filterEmployee(val, update, abort) {
update(() => {
if (val === '') {
this.myEmployeeList = this.employeeList
}
else {
const needle = val.toLowerCase();
this.myEmployeeList = this.employeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1);
}
})
},
//获取员工列表
getEmployeeList() {
queryEmployee({
IsLeave: 1
}).then(res => {
this.employeeList = res.Data;
this.myEmployeeList = res.Data;
})
},
//获取转介人下拉
getStudentDorpDown() {
getStudentDorpDownList().then(res => {
if (res.Code == 1) {
this.TransListData = res.Data;
this.MyTransListData = res.Data;
}
})
},
//获取客户下拉数据
GetCustomerList() {
let msg = {
QCreateBy: 0
jsonData.unshift(obj)
if (jsonData && jsonData.length > 0) {
this.ClassList = JSON.parse(JSON.stringify(jsonData));
this.allClassList = JSON.parse(JSON.stringify(jsonData));;
}
GetCustomerList(msg).then(res => {
if (res.Code == 1) {
this.customList = res.Data;
this.allCustomList = res.Data;
}
})
},
//筛选客户
filterFn(val, update) {
update(() => {
if (val === "") {
this.customList = JSON.parse(JSON.stringify(this.allCustomList));
} else {
const needle = val.toLowerCase();
this.customList = this.allCustomList.filter(
(v) => v.CustomerName.toLowerCase().indexOf(needle) > -1
);
}
});
},
handleCurrentChanges(val) {
this.msg.PageIndex = val;
this.getList()
},
//选择班级
setClass(item) {
this.isShowClass = true;
getClassDropDownList({
CourseId: 0,
IsAddDefault: 1, //添加默认选项
}).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
let obj = {
ClassId: 0,
ClassName: '不限'
}
jsonData.unshift(obj)
if (jsonData && jsonData.length > 0) {
this.ClassList = JSON.parse(JSON.stringify(jsonData));
this.allClassList = JSON.parse(JSON.stringify(jsonData));;
}
}
});
},
//筛选班级
filterFnbanji(val, update) {
update(() => {
if (val === '') {
this.ClassList = JSON.parse(JSON.stringify(this.allClassList))
} else {
const needle = val.toLowerCase()
this.ClassList = this.allClassList.filter(v => v.ClassName.toLowerCase().indexOf(needle) > -1)
}
})
},
getBranchList() {//获取校区
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: '-1'
}
this.schoolList.unshift(obj);
}).catch(() => {
})
},
//获取学员下拉信息
getStudentList() {
var qMsg = {
SchoolId: this.msg.SchoolId
};
GetStudentList(qMsg).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.AllInvitationList = JSON.parse(JSON.stringify(jsonData));
this.InvitationList = JSON.parse(JSON.stringify(jsonData));
}
}
})
},
filterFnStudent(val, update) {
update(() => {
if (val === '') {
this.InvitationList = JSON.parse(JSON.stringify(this.AllInvitationList))
} else {
const needle = val.toLowerCase()
this.InvitationList = this.AllInvitationList.filter(v => v.StuName.toLowerCase().indexOf(needle) > -1)
}
})
},
getPeriodList() {//获取周期下拉列表
getCommissionPeriodsList({}).then(res => {
if (res.Code == 1) {
this.PeriodsList = res.Data
let obj = {
BatchName: '不限',
Id: '0'
}
this.PeriodsList.unshift(obj)
}
})
},
tcexport() {//导出
var msg = JSON.parse(JSON.stringify(this.msg));
let text = '用户返佣/存折明细.xls'
if(msg.CommissionType==1){
text = '用户返佣.xls'
}
});
},
//筛选班级
filterFnbanji(val, update) {
update(() => {
if (val === '') {
this.ClassList = JSON.parse(JSON.stringify(this.allClassList))
} else {
const needle = val.toLowerCase()
this.ClassList = this.allClassList.filter(v => v.ClassName.toLowerCase().indexOf(needle) > -1)
}
})
},
getBranchList() { //获取校区
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: '-1'
}
this.schoolList.unshift(obj);
}).catch(() => {})
},
//获取学员下拉信息
getStudentList() {
var qMsg = {
SchoolId: this.msg.SchoolId
};
GetStudentList(qMsg).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.AllInvitationList = JSON.parse(JSON.stringify(jsonData));
this.InvitationList = JSON.parse(JSON.stringify(jsonData));
}
if(msg.CommissionType==2){
text = '幸福存折明细.xls'
}
})
},
filterFnStudent(val, update) {
update(() => {
if (val === '') {
this.InvitationList = JSON.parse(JSON.stringify(this.AllInvitationList))
} else {
const needle = val.toLowerCase()
this.InvitationList = this.AllInvitationList.filter(v => v.StuName.toLowerCase().indexOf(needle) > -1)
}
})
},
getPeriodList() { //获取周期下拉列表
getCommissionPeriodsList({}).then(res => {
if (res.Code == 1) {
this.PeriodsList = res.Data
let obj = {
BatchName: '不限',
Id: '0'
}
EduDownLoad("/CustomerCommission/GetCommissionStatisticsToExcel", msg, text)
},
goUrlclass(path, Names) {//班级
let Name = encodeURI(Names)
this.OpenNewUrl(path, {
ClassName: Name,
});
},
goUrlorderList(path, row) {//订单跳转
this.OpenNewUrl(path, {
OrderId: row.OrderId,
// EnterID:row.UserId
});
},
this.PeriodsList.unshift(obj)
}
})
},
tcexport() { //导出
var msg = JSON.parse(JSON.stringify(this.msg));
let text = '用户返佣/存折明细.xls'
if (msg.CommissionType == 1) {
text = '用户返佣.xls'
}
if (msg.CommissionType == 2) {
text = '幸福存折明细.xls'
}
EduDownLoad("/CustomerCommission/GetCommissionStatisticsToExcel", msg, text)
},
goUrlclass(path, Names) { //班级
let Name = encodeURI(Names)
this.OpenNewUrl(path, {
ClassName: Name,
});
},
goUrlorderList(path, row) { //订单跳转
this.OpenNewUrl(path, {
OrderId: row.OrderId,
});
},
},
}
}
</script>
<style lang="sass">
@import url('~assets/
@import url('~assets/css/table.sass')
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
src/pages/teacher/appraisalList.vue
View file @ 5b6d4fd0
......@@ -17,7 +17,7 @@
</template>
</q-field>
</div>
<div class="col-2">
<div class="col-2" v-if="isHaveEdit">
<q-select filled v-model="msg.TeacherAccountId" dense use-input label="教师" :options="MyTeacherListData"
option-label="EmployeeName" @input="refreshPage" clearable option-value="Id" emit-value map-options />
</div>
......@@ -30,19 +30,11 @@
<div class="col-2 q-table__title">教师月度考核列表</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="考核" @click="goAssessTable()" />
<q-btn v-if="isHaveEdit" color="accent" size="sm" class="q-mr-md" icon="add" label="考核"
@click="goAssessTable()" />
</div>
</template>
<!-- <template v-slot:body-cell-AuditStatus="props">
<q-td :props="props">
<template v-if="props.row.AuditStatus==0">
待提交
</template>
<template v-else>
{{props.row.AuditStatusName}}
</template>
</q-td>
</template> -->
<template v-slot:body-cell-OptionId="props">
<q-td :props="props">
<!-- <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="submitApproval(props.row)"
......@@ -51,6 +43,8 @@
label="评价" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,2)"
label="建议" /> -->
<q-btn v-if="isHaveEdit" flat size="xs" icon="edit" color="accent" style="font-weight:400"
@click="goAssessTable(props.row)" label="编辑" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="gotoDetail(props.row)"
label="详情" />
</q-td>
......@@ -76,6 +70,9 @@
} from "../../api/users/user";
import behaviorForm from "../../components/teacher/behavior-form.vue";
import helpForm from "../../components/teacher/help-form.vue";
import {
mapState
} from "vuex";
export default {
meta: {
title: "教师月度考评"
......@@ -132,12 +129,6 @@
field: "TotalScore",
align: "left"
},
// {
// name: "AuditStatus",
// label: "审核状态",
// field: "AuditStatus",
// align: "left"
// },
{
name: 'OptionId',
label: '操作',
......@@ -152,6 +143,21 @@
MyTeacherListData: [], //教师列表
}
},
computed: mapState({
//是否有下载权限
isHaveEdit(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "Edit_TeacherAssessment") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
created() {
let today = new Date();
this.msg.YearStr = today.getFullYear().toString();
......@@ -160,6 +166,10 @@
this.findData();
},
mounted() {
if (!this.isHaveEdit) {
let userinfo = this.getLocalStorage();
this.msg.TeacherAccountId = userinfo.Id;
}
this.getTeacherAssessmentPage()
},
methods: {
......@@ -197,8 +207,13 @@
this.getTeacherAssessmentPage();
},
//跳转考核新增修改页面
goAssessTable() {
this.OpenNewUrl('/teacher/jobEvaluation', {});
goAssessTable(item) {
var qObj = {};
if (item) {
qObj.Id = item.Id;
qObj.TeacherAccountId = item.TeacherAccountId;
}
this.OpenNewUrl('/teacher/jobEvaluation', qObj);
},
//跳转到考核详情页面
gotoDetail(item) {
......
src/pages/teacher/jobEvaluation.vue
View file @ 5b6d4fd0
......@@ -34,7 +34,8 @@
<div class="col-2 jobEvaluationDate q-mr-lg">
<q-field filled stack-label dense label="考核月份">
<template v-slot:control>
<el-date-picker v-model="teacherDate" value-format="yyyy-MM" size="mini" type="month" placeholder="选择考核月份">
<el-date-picker v-model="teacherDate" value-format="yyyy-MM" size="mini" type="month"
placeholder="选择考核月份">
</el-date-picker>
</template>
</q-field>
......@@ -107,8 +108,8 @@
TotalScore: 0, //总分
DetailsList: [],
CheckType: 0, //1-教学主管，2-教务主管
IsJiaoWuFinish:0,//教务主管是否完成打分
IsTeacherFinish:0,//教学主管是否完成打分
IsJiaoWuFinish: 0, //教务主管是否完成打分
IsTeacherFinish: 0, //教学主管是否完成打分
},
isAuth: false, //是否有权限
saveLoading: false,
......@@ -122,7 +123,15 @@
this.GetTeacherList();
},
mounted() {
if (this.$route.query) {
if (this.$route.query.Id) {
this.saveObj.Id = this.$route.query.Id;
}
if (this.$route.query.TeacherAccountId) {
this.saveObj.TeacherAccountId = this.$route.query.TeacherAccountId
}
this.getInfo();
}
},
methods: {
changeStatus(subItem, optionItem) {
......@@ -161,6 +170,7 @@
TeacherAccountId: this.saveObj.TeacherAccountId,
YearStr: this.saveObj.YearStr,
MonthStr: this.saveObj.MonthStr,
Id: this.saveObj.Id,
};
queryTeacherAssessmentInfo(qMsg).then(res => {
if (res.Code == 1) {
......@@ -176,8 +186,8 @@
this.saveObj.TotalScore = tempData.TotalScore;
this.saveObj.CheckType = tempData.CheckType;
this.saveObj.DetailsList = tempData.DetailsList;
this.saveObj.IsTeacherFinish=tempData.IsTeacherFinish;
this.saveObj.IsJiaoWuFinish=tempData.IsJiaoWuFinish;
this.saveObj.IsTeacherFinish = tempData.IsTeacherFinish;
this.saveObj.IsJiaoWuFinish = tempData.IsJiaoWuFinish;
} else {
this.$q.notify({
type: 'negative',
......@@ -203,7 +213,19 @@
color: 'accent',
timeout: 2000,
message: '数据保存成功！',
position: 'top'
position: 'top',
actions: [{
label: "点击查看",
color: "primary",
handler: () => {
this.$router.push({
path: "/teacher/appraisalList",
query: {
}
});
}
}],
})
}
}).catch(() => {
......
src/pages/teacher/teacherAssessment.vue
View file @ 5b6d4fd0
......@@ -210,7 +210,6 @@
this.getInfo();
},
methods: {
//获取教师下拉
GetTeacherList() {
var qMsg = {
......
src/pages/teacher/teacherTrack.vue
View file @ 5b6d4fd0
......@@ -347,7 +347,6 @@
} from '../../api/course/index'
import {
queryEmployee,
} from "../../api/users/user";
import {
queryGuestStateList,
......
src/pages/user/login.vue
View file @ 5b6d4fd0
......@@ -191,6 +191,11 @@ export default {
immediate: true
}
},
mounted() {
if (tccc && tccc.Agent) {
tccc.Agent.offline();
}
},
methods: {
callBackUserInfo(code) {
setUserCodeCallBack({
......@@ -228,7 +233,7 @@ export default {
const s = document.createElement("script");
s.type = "text/javascript";
s.src =
"http://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.5.js";
"https://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.5.js";
const wxElement = document.body.appendChild(s);
// 调用企业微信二维码方法
wxElement.onload = function() {
......
src/router/routes.js
View file @ 5b6d4fd0
This source diff could not be displayed because it is too large. You can view the blob instead.
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