Skip to content

C
confucius
Commit 42bb9997 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 5b6d4fd0
Show whitespace changes
Inline Side-by-side
Showing with 1646 additions and 1379 deletions
quasar.conf.js
View file @ 42bb9997
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// https://quasar.dev/quasar-cli/quasar-conf-js // https://quasar.dev/quasar-cli/quasar-conf-js
/* eslint-env node */ /* eslint-env node */
module.exports = function (ctx) { module.exports = function(ctx) {
return { return {
// https://quasar.dev/quasar-cli/supporting-ts // https://quasar.dev/quasar-cli/supporting-ts
supportTS: false, supportTS: false,
...@@ -47,8 +47,8 @@ module.exports = function (ctx) { ...@@ -47,8 +47,8 @@ module.exports = function (ctx) {
vueRouterMode: 'hash', // available values: 'hash', 'history' vueRouterMode: 'hash', // available values: 'hash', 'history'
env: ctx.dev ? { env: ctx.dev ? {
API: 'http://localhost:5001/api', //API: 'http://localhost:5001/api',
// API: 'http://192.168.10.46:8300/api', API: 'http://192.168.10.46:8300/api',
// API: 'https://eduapi.oytour.com/api', // API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://192.168.10.17:8087/api', API_ZC: 'http://192.168.10.17:8087/api',
API_SK: 'ws:192.168.10.214:', API_SK: 'ws:192.168.10.214:',
...@@ -254,7 +254,7 @@ module.exports = function (ctx) { ...@@ -254,7 +254,7 @@ module.exports = function (ctx) {
// More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration
nodeIntegration: true, nodeIntegration: true,
extendWebpack( /* cfg */) { extendWebpack( /* cfg */ ) {
// do something with Electron main process Webpack cfg // do something with Electron main process Webpack cfg
// chainWebpack also available besides this extendWebpack // chainWebpack also available besides this extendWebpack
} }
......
src/api/studentmsg/index.js
View file @ 42bb9997
import request from '../../utils/request' import request from '../../utils/request'
import request_zc from '../../utils/request_zc'
/* /*
......
src/components/activity/student-from.vue 0 → 100644
View file @ 42bb9997
<style scoped>
.wenjuan_Shuru {
position: relative;
}
.SurverDel {
position: absolute;
right: -5px;
top: -5px;
}
</style>
<template>
<q-dialog
v-model="persistent"
content-class="bg-grey-1"
persistent
transition-show="scale"
transition-hide="scale"
>
<q-card style="width: 800px;max-width:800px;">
<q-card-section>
<div class="text-h6">{{addMsg.ID==0?'新增学员':'修改学员'}}</div>
</q-card-section>
<q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<div class="row wrap">
<!-- <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.SurveyType"
:options="platList" label="客户类型" ref="SurveyType" @input="getPlat()" :rules="[val => !!val || '请选择类型']" class="col-12 q-pb-lg" emit-value map-options />
-->
<q-input
filled
v-model="addMsg.Sort"
class="col-12 q-pb-lg"
ref="Sort"
label="学员编号"
:rules="[val => !!val || '请填写排序']"
></q-input>
<div class="col-12 q-pb-lg">
<q-input
filled
v-model="addMsg.StartTime"
mask="####-##-## ##:##:##"
ref="SignStartTime"
label="开始时间"
:rules="[val => !!val || '请选择开始时间']"
>
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date
v-model="addMsg.StartTime"
mask="YYYY-MM-DD HH:mm:ss"
@input="date"
/>
<q-time
v-model="addMsg.StartTime"
format24h
mask="YYYY-MM-DD HH:mm:ss"
@input="time"
/>
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="col-12 q-pb-lg">
<q-input filled v-model="addMsg.EndTime" mask="####-##-## ##:##:##" ref="SignEndTime" label="结束时间" :rules="[val => !!val || '请选择结束时间']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date
v-model="addMsg.EndTime"
mask="YYYY-MM-DD HH:mm:ss"
@input="endDate"
/>
<q-time
v-model="addMsg.EndTime"
format24h
mask="YYYY-MM-DD HH:mm:ss"
@input="endTime"
/>
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
<q-btn label="立即提交" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading" @click="saveActive" />
</q-card-actions>
</q-card>
</q-dialog>
</template>
<script>
import {
setActivitySurveyGuest,
getActivitySurveyGuestModule
} from '../../api/studentmsg/index'
export default {
props: {
saveObj: {
type: Object,
default: null
},
ID: {
type: String,
default: null
}
},
data() {
return {
persistent: true,
addMsg: {
Id: 0, //新增传0
GuestType: 2, //客户类型(1-小程序用户,2-学员用户)
GuestId: 2644, //学员编号
StartTime: "2022-04-20 00:00:00", //开始时间
EndTime: "2022-04-25 18:00:00", //结束时间
SurveyId: 0 //意见调查表编号
},
platList: [],
dateList: [],
FormTypeList: [],
saveLoading: false
};
},
mounted() {
this.initObj();
},
methods: {
// 选择报名开始时间
date(val) {
this.addMsg.SignStartTime = val;
},
time(val) {
this.addMsg.SignStartTime = val;
},
// 选择报名结束时间
endDate(val) {
this.addMsg.SignEndTime = val;
},
endTime(val) {
this.addMsg.SignEndTime = val;
},
//初始化表单
initObj() {
this.addMsg.SurveyId = this.ID
if (this.saveObj && this.saveObj.ID > 0) {
getActivitySurveyGuestModule({
Id: saveObj.ID
}).then(res => {
this.addMsg = res.data.data;
console.log("11111", res);
})
} else {
this.addMsg.Id = 0;
// this.addMsg.GuestId = 1;
// this.StartTime = '';
// this.EndTime = '';
}
},
//关闭弹窗
closeSaveForm() {
this.$emit("close");
this.persistent = false;
},
saveActive() {
setActivitySurveyGuest(this.addMsg).then(res => {
if (res.data.Id == 0) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '数据保存成功！',
position: 'top'
})
this.$emit('close');
this.$emit('success');
} else {
this.$q.notify({
type: 'negative',
position: "top",
message: res.data.message
})
}
})
}
}
};
</script>
\ No newline at end of file
src/components/stuMan/eventsCalendar.vue
View file @ 42bb9997
...@@ -287,9 +287,19 @@ ...@@ -287,9 +287,19 @@
<div> <div>
<div class="eventsCalendar_Form"> <div class="eventsCalendar_Form">
<div style="text-align:right;margin:12px 20px 8px 0"> <div style="text-align:right;margin:12px 20px 8px 0">
<el-date-picker style="width:190px" v-model="date" type="month" size="small"  value-format="yyyy-M-d" <el-date-picker
@change="getList()" placeholder="选择日期"> style="width:190px"
v-model="date"
type="date"
:clearable="false"
value-format="yyyy-MM-d"
:picker-options="pickerOptions"
:editable="false"
placeholder="选择日期"
@change="getList"
>
</el-date-picker> </el-date-picker>
</div> </div>
<template> <template>
<el-calendar v-model="date" id="calendar" style="margin-bottom:40px;"> <el-calendar v-model="date" id="calendar" style="margin-bottom:40px;">
......
src/components/work/index.vue
View file @ 42bb9997
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</div> --> </div> -->
<q-btn-group <q-btn-group
outline outline
style="position: fixed;top: 75px;right:20px;z-index: 666666;" style="position: fixed;top: 15px;right:20px;z-index: 666666;"
> >
<q-btn <q-btn
dense dense
......
src/pages/Work.vue
View file @ 42bb9997
...@@ -7,26 +7,54 @@ ...@@ -7,26 +7,54 @@
<el-tab-pane :label="item.label" :name="item.value" :key="item.value" v-for="(item, index) in options"></el-tab-pane> <el-tab-pane :label="item.label" :name="item.value" :key="item.value" v-for="(item, index) in options"></el-tab-pane>
</el-tabs> </el-tabs>
</div> --> </div> -->
<q-btn flat @click="changeMenu(5)" :color="chosenMenu==5?'primary':'blue-grey-14'" :class="[chosenMenu==5?'text-weight-bold':'']" label="工作台"></q-btn> <q-btn
<q-btn @click="changeMenu(1)" flat :color="chosenMenu==1?'primary':'blue-grey-14'" :class="[chosenMenu==1?'text-weight-bold':'']" label="OKR 工作区"> flat
<q-menu v-if="chosenMenu==1"> @click="changeMenu(6)"
:color="chosenMenu == 6 ? 'primary' : 'blue-grey-14'"
:class="[chosenMenu == 6 ? 'text-weight-bold' : '']"
label="活动日历"
></q-btn>
<q-btn
flat
@click="changeMenu(5)"
:color="chosenMenu == 5 ? 'primary' : 'blue-grey-14'"
:class="[chosenMenu == 5 ? 'text-weight-bold' : '']"
label="工作台"
></q-btn>
<q-btn
@click="changeMenu(1)"
flat
:color="chosenMenu == 1 ? 'primary' : 'blue-grey-14'"
:class="[chosenMenu == 1 ? 'text-weight-bold' : '']"
label="OKR 工作区"
>
<q-menu v-if="chosenMenu == 1">
<q-list> <q-list>
<q-item clickable @click="okrMenu=1"> <q-item clickable @click="okrMenu = 1">
<q-item-section q-item-section avatar> <q-item-section q-item-section avatar>
<inline-svg class="svg-icon svg-icon-secondary" src="icons/svg/Text/Edit-text.svg"></inline-svg> <inline-svg
class="svg-icon svg-icon-secondary"
src="icons/svg/Text/Edit-text.svg"
></inline-svg>
</q-item-section> </q-item-section>
<q-item-section>OKR</q-item-section> <q-item-section>OKR</q-item-section>
</q-item> </q-item>
<q-separator /> <q-separator />
<q-item clickable @click="okrMenu=2"> <q-item clickable @click="okrMenu = 2">
<q-item-section q-item-section avatar> <q-item-section q-item-section avatar>
<inline-svg class="svg-icon svg-icon-secondary" src="icons/svg/General/Visible.svg"></inline-svg> <inline-svg
class="svg-icon svg-icon-secondary"
src="icons/svg/General/Visible.svg"
></inline-svg>
</q-item-section> </q-item-section>
<q-item-section>对齐视图</q-item-section> <q-item-section>对齐视图</q-item-section>
</q-item> </q-item>
<q-item clickable> <q-item clickable>
<q-item-section q-item-section avatar> <q-item-section q-item-section avatar>
<inline-svg class="svg-icon svg-icon-secondary" src="icons/svg/Shopping/Chart-pie.svg"></inline-svg> <inline-svg
class="svg-icon svg-icon-secondary"
src="icons/svg/Shopping/Chart-pie.svg"
></inline-svg>
</q-item-section> </q-item-section>
<q-item-section>数据看板</q-item-section> <q-item-section>数据看板</q-item-section>
</q-item> </q-item>
...@@ -35,56 +63,70 @@ ...@@ -35,56 +63,70 @@
</q-btn> </q-btn>
<!-- <q-btn @click="changeMenu(2)" v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理"> <!-- <q-btn @click="changeMenu(2)" v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理">
</q-btn>--> </q-btn>-->
<q-btn flat @click="changeMenu(3)" :color="chosenMenu==3?'primary':'blue-grey-14'" :class="[chosenMenu==3?'text-weight-bold':'']" label="我的排班计划"></q-btn> <q-btn
<q-btn flat @click="changeMenu(4)" v-if="AccountType==2" :color="chosenMenu==4?'primary':'blue-grey-14'" :class="[chosenMenu==4?'text-weight-bold':'']" label="我的上课计划"></q-btn> flat
<q-btn flat @click="changeMenu(6)" :color="chosenMenu==6?'primary':'blue-grey-14'" :class="[chosenMenu==6?'text-weight-bold':'']" label="活动日历"></q-btn> @click="changeMenu(3)"
:color="chosenMenu == 3 ? 'primary' : 'blue-grey-14'"
:class="[chosenMenu == 3 ? 'text-weight-bold' : '']"
label="我的排班计划"
></q-btn>
<q-btn
flat
@click="changeMenu(4)"
v-if="AccountType == 2"
:color="chosenMenu == 4 ? 'primary' : 'blue-grey-14'"
:class="[chosenMenu == 4 ? 'text-weight-bold' : '']"
label="我的上课计划"
></q-btn>
</div> </div>
<div class="bg-white col" v-if="chosenMenu==6"> <div class="bg-white col" v-if="chosenMenu == 6">
<eventsCalendar></eventsCalendar> <eventsCalendar></eventsCalendar>
</div> </div>
<div class="bg-white col" v-if="chosenMenu==5"> <div class="bg-white col" v-if="chosenMenu == 5">
<work></work> <work></work>
</div> </div>
<div v-if="chosenMenu==1" class="flex col" style="flex: 1"> <div v-if="chosenMenu == 1" class="flex col" style="flex: 1">
<okr v-if="okrMenu==1"></okr> <okr v-if="okrMenu == 1"></okr>
<align-view v-if="okrMenu==2"></align-view> <align-view v-if="okrMenu == 2"></align-view>
</div> </div>
<div v-if="chosenMenu==2" class="col comWorkDiv" style="overflow: auto"> <div v-if="chosenMenu == 2" class="col comWorkDiv" style="overflow: auto">
<teachplan></teachplan> <teachplan></teachplan>
</div> </div>
<!-- 备课管理 --> <!-- 备课管理 -->
<div v-if="chosenMenu==3" class="comWorkDiv" style="overflow: auto"> <div v-if="chosenMenu == 3" class="comWorkDiv" style="overflow: auto">
<mySchedule></mySchedule> <mySchedule></mySchedule>
</div> </div>
<!-- 我的上课计划 --> <!-- 我的上课计划 -->
<div v-if="chosenMenu==4" class="comWorkDiv" style="overflow: auto"> <div v-if="chosenMenu == 4" class="comWorkDiv" style="overflow: auto">
<myClassmate></myClassmate> <myClassmate></myClassmate>
</div> </div>
<!-- zk新增公告弹窗 --> <!-- zk新增公告弹窗 -->
<notice-form v-if="isShowNotice" @fathergoBefore="fathergoBefore" @fathergoAfter="fathergoAfter" :seting-obj="noticeObj" @close="closeNoticeForm"> <notice-form
v-if="isShowNotice"
@fathergoBefore="fathergoBefore"
@fathergoAfter="fathergoAfter"
:seting-obj="noticeObj"
@close="closeNoticeForm"
>
</notice-form> </notice-form>
</div> </div>
</template> </template>
<script> <script>
import { GetMyNoticePageList } from "../api/course/index";
import { import teachplan from "./course/teacherLesson";
GetMyNoticePageList import okr from "./okr/index";
} from '../api/course/index' import alignView from "./okr/okr-align-view";
import noticeForm from "../components/course/notice-form";
import teachplan from './course/teacherLesson' import mySchedule from "./scheduling/mySchedule";
import okr from './okr/index' import myClassmate from "./scheduling/myClassmate";
import alignView from './okr/okr-align-view' import work from "../components/work/index";
import noticeForm from '../components/course/notice-form' import eventsCalendar from "../components/stuMan/eventsCalendar";
import mySchedule from './scheduling/mySchedule'
import myClassmate from './scheduling/myClassmate';
import work from '../components/work/index'
import eventsCalendar from '../components/stuMan/eventsCalendar'
export default { export default {
components:{ components: {
teachplan, teachplan,
okr, okr,
alignView, alignView,
...@@ -94,148 +136,153 @@ ...@@ -94,148 +136,153 @@
work, work,
eventsCalendar eventsCalendar
}, },
name: 'PageIndex', name: "PageIndex",
data(){ data() {
return{ return {
options:[ options: [{ label: "OKR", value: "one" }],
{label: 'OKR', value: 'one'}, model: "one",
AccountType: 1,
], ispower: false, //是否显示备课管理
model: 'one', chosenMenu: 6,
AccountType:1, okrMenu: 1,
ispower:false,//是否显示备课管理
chosenMenu:5,
okrMenu:1,
//通知请求参数 //通知请求参数
noticeMsg:{ noticeMsg: {
pageIndex:1, pageIndex: 1,
pageSize:1, pageSize: 1,
          LookTime:"" LookTime: ""
},
isShowNotice:false,
noticeObj:{},
TimeList:[], //存放时间作为比较
}
}, },
created() { isShowNotice: false,
noticeObj: {},
TimeList: [] //存放时间作为比较
};
}, },
created() {},
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.AccountType = userInfo.AccountType this.AccountType = userInfo.AccountType;
if(userInfo.AccountType && userInfo.AccountType==2){ //是否是教师1不是 2是 if (userInfo.AccountType && userInfo.AccountType == 2) {
this.options=[ //是否是教师1不是 2是
{label: 'OKR', value: 'one'}, this.options = [
{label: '备课管理', value: 'two'}, { label: "OKR", value: "one" },
{ label: "备课管理", value: "two" }
]; ];
} }
this.ispower = false; this.ispower = false;
if(userInfo.MenuList.length>0){ if (userInfo.MenuList.length > 0) {
this.getMapList(userInfo.MenuList)//判断菜单权限是否有 this.getMapList(userInfo.MenuList); //判断菜单权限是否有
} }
if(this.ispower==true){ if (this.ispower == true) {
this.options=[ this.options = [
{label: 'OKR', value: 'one'}, { label: "OKR", value: "one" },
{label: '备课管理', value: 'two'}, { label: "备课管理", value: "two" }
]; ];
} }
var notifyTime = window.localStorage.getItem('notifyTime'); var notifyTime = window.localStorage.getItem("notifyTime");
if(notifyTime){ if (notifyTime) {
this.noticeMsg.LookTime = notifyTime; this.noticeMsg.LookTime = notifyTime;
} }
this.getNoticeList(); this.getNoticeList();
}, },
methods:{ methods: {
changeMenu(i){ changeMenu(i) {
if(i==1){ if (i == 1) {
this.okrMenu=1 this.okrMenu = 1;
} }
this.chosenMenu=i this.chosenMenu = i;
}, },
getMapList(list){ getMapList(list) {
list.forEach(x=>{ list.forEach(x => {
if(x.MenuUrl == '/course/teacherLesson'){ if (x.MenuUrl == "/course/teacherLesson") {
this.ispower=true this.ispower = true;
} }
if(x.SubList.length>0){ if (x.SubList.length > 0) {
this.getMapList(x.SubList) this.getMapList(x.SubList);
} }
}) });
}, },
//获取获取公告弹窗数据 //获取获取公告弹窗数据
getNoticeList(){ getNoticeList() {
GetMyNoticePageList(this.noticeMsg).then(res => { GetMyNoticePageList(this.noticeMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.noticeObj = res.Data; this.noticeObj = res.Data;
if(res.Data.PageData.length>0){ if (res.Data.PageData.length > 0) {
this.isShowNotice=true; this.isShowNotice = true;
} }
if(res.Data.PageData[0]&&res.Data.PageData[0].UpdateTimeStr){ if (res.Data.PageData[0] && res.Data.PageData[0].UpdateTimeStr) {
this.TimeList.push(new Date(res.Data.PageData[0].UpdateTimeStr)); this.TimeList.push(new Date(res.Data.PageData[0].UpdateTimeStr));
var maxDate=new Date(Math.max.apply(null,this.TimeList)); var maxDate = new Date(Math.max.apply(null, this.TimeList));
var date = new Date(maxDate); var date = new Date(maxDate);
var y = date.getFullYear(); var y = date.getFullYear();
var m = date.getMonth() + 1; var m = date.getMonth() + 1;
m = m < 10 ? ('0' + m) : m; m = m < 10 ? "0" + m : m;
var d = date.getDate(); var d = date.getDate();
d = d < 10 ? ('0' + d) : d; d = d < 10 ? "0" + d : d;
var notifyData = y+'-'+m+'-'+d+' '+ date.getHours() + ':' +date.getMinutes() + ':' + date.getSeconds(); var notifyData =
y +
"-" +
m +
"-" +
d +
" " +
date.getHours() +
":" +
date.getMinutes() +
":" +
date.getSeconds();
localStorage.setItem("notifyTime", notifyData); localStorage.setItem("notifyTime", notifyData);
} }
} }
}) });
}, },
//关闭公告弹窗 //关闭公告弹窗
closeNoticeForm(){ closeNoticeForm() {
this.isShowNotice=false; this.isShowNotice = false;
}, },
//向后翻页 //向后翻页
fathergoAfter(){ fathergoAfter() {
this.noticeMsg.pageIndex++; this.noticeMsg.pageIndex++;
this.getNoticeList(); this.getNoticeList();
}, },
//往回翻页 //往回翻页
fathergoBefore(){ fathergoBefore() {
this.noticeMsg.pageIndex--; this.noticeMsg.pageIndex--;
this.getNoticeList(); this.getNoticeList();
} }
} }
} };
</script> </script>
<style> <style>
.homebx .box{ .homebx .box {
width: 100%; width: 100%;
height: 50px; height: 50px;
}
} .homebx {
.homebx {
margin: 0; margin: 0;
} }
.myscroll::-webkit-scrollbar { .myscroll::-webkit-scrollbar {
display: none; display: none;
} }
.box .el-tabs__header{ .box .el-tabs__header {
margin: 0; margin: 0;
} }
.sub-header{ .sub-header {
position: fixed; position: fixed;
height: 56px; height: 56px;
top: 60px; top: 0;
left: 0; left: 0;
right: 0; right: 0;
transition: top .3s ease; transition: top 0.3s ease;
z-index: 95; z-index: 95;
box-shadow: 0 10px 30px 0 rgba(82,63,105,.08); box-shadow: 0 10px 30px 0 rgba(82, 63, 105, 0.08);
background-color: #fff; background-color: #fff;
border-top: 1px solid #ebedf3; border-top: 1px solid #ebedf3;
margin: 0; margin: 0;
padding: 10px 20px; padding: 10px 20px;
} }
.comWorkDiv{ .comWorkDiv {
height: 100vh height: 100vh;
} }
</style> </style>
src/pages/activity/QuesActivityList.vue
View file @ 42bb9997
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="iconfont icon-view" color="accent" style="font-weight:400" label="配置学员"
@click="Gochild(props.row)" />
<q-btn flat size="xs" icon="iconfont icon-view" color="accent" style="font-weight:400" label="配置" <q-btn flat size="xs" icon="iconfont icon-view" color="accent" style="font-weight:400" label="配置"
@click="GoYijian(props.row)" /> @click="GoYijian(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
...@@ -248,6 +250,12 @@ ...@@ -248,6 +250,12 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
// 跳转到配置学员详情页
Gochild(row){
this.OpenNewUrl('/activity/configurationstudentsList',{
ID: row.ID
});
},
//跳转到意见调查表 //跳转到意见调查表
GoYijian(row) { GoYijian(row) {
this.OpenNewUrl('/activity/questionnaireList', { this.OpenNewUrl('/activity/questionnaireList', {
......
src/pages/activity/configurationstudentsList.vue
View file @ 42bb9997
...@@ -12,23 +12,23 @@ ...@@ -12,23 +12,23 @@
<!-- @click="addObj(null)" --> <!-- @click="addObj(null)" -->
</div> </div>
</template> </template>
<template v-slot:body-cell-IsRequired="props"> <template v-slot:body-cell-IsRequired="props">
<q-td :props="props"> <q-td :props="props">
<span v-if="props.row.IsRequired==0">否</span> <span v-if="props.row.IsRequired==0">否</span>
<span v-if="props.row.IsRequired==1">是</span> <span v-if="props.row.IsRequired==1">是</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-IsShow="props"> <template v-slot:body-cell-IsShow="props">
<q-td :props="props"> <q-td :props="props">
<span v-if="props.row.IsShow==0">是</span> <span v-if="props.row.IsShow==0">是</span>
<span v-if="props.row.IsShow==1">否</span> <span v-if="props.row.IsShow==1">否</span>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount" <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="addObj(props.row)" /> @click="addObj(props.row)" />
...@@ -36,59 +36,38 @@ ...@@ -36,59 +36,38 @@
@click="delQuestion(props.row)" /> @click="delQuestion(props.row)" />
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
<wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></wenjuan-form> <student-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></student-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import wenjuanForm from '../../components/activity/wenjuan-form' import studentForm from '../../components/activity/student-from'
import {
getActivitySurveyGuestPage,
removeActivitySurveyGuest
} from '../../api/studentmsg/index'
export default { export default {
meta: { meta: {
title: "意见调查表" title: "意见调查表"
}, },
components: { components: {
wenjuanForm studentForm
}, },
data() { data() {
return { return {
columns: [ columns: [{
{ name: 'Id',
name: 'ID',
label: 'ID', label: 'ID',
align: 'left', align: 'left',
field: 'ID' field: 'Id'
}, }, {
{ name: 'GuestName',
name: 'Title', label: '学员名称',
label: '问题名称', field: 'GuestName',
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' align: 'left'
}, },
{ {
name: 'optioned', name: 'optioned',
label: '操作', label: '操作',
...@@ -97,75 +76,44 @@ ...@@ -97,75 +76,44 @@
], ],
dataList: [], dataList: [],
loading: true, loading: true,
ShowOpts: [{ msg: {
label: '不限', pageIndex: 1,
value: '-1' pageSize: 12,
}, rowsPerPage: 12,
{ SurveyId: 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, pageCount: 0,
isShowWenjuan: false, isShowWenjuan: false,
objOption: null, objOption: null,
} }
}, },
created() { created() {
}, if (this.$route.query && this.$route.query.ID) {
mounted() {
if(this.$route.query&&this.$route.query.ID){
this.msg.ActivitySurveyId = this.$route.query.ID; this.msg.ActivitySurveyId = this.$route.query.ID;
} }
this.getPlat(); },
mounted() {
this.getList(); this.getList();
}, },
methods: { 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() { resetSearch() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.getList(); this.getList();
}, },
getList(){ getList() {
this.loading=true; this.loading = true;
this.apipostDS("/api/Survey/GetPageList", this.msg, res => { getActivitySurveyGuestPage(this.msg).then(res => {
this.loading=false; this.loading = false;
if(res.data.resultCode==1){ if (res.Code == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.Data.PageData;
this.pageCount = res.data.data.pageCount; this.pageCount = res.Data.Count
}else {
this.Info(res.data.message);
} }
}) console.log("res", res);
});
}, },
addObj(obj) { addObj(obj) {
if (obj) { if (obj) {
...@@ -175,8 +123,8 @@ ...@@ -175,8 +123,8 @@
} }
this.isShowWenjuan = true; this.isShowWenjuan = true;
}, },
//删除问卷 //删除当前行信息
delQuestion(row){ delQuestion(row) {
let that = this; let that = this;
this.$q.dialog({ this.$q.dialog({
title: "提示", title: "提示",
...@@ -191,11 +139,13 @@ ...@@ -191,11 +139,13 @@
focus: true focus: true
} }
}).onOk(() => { }).onOk(() => {
that.apipostDS( removeActivitySurveyGuest({
"/api/Survey/DelSurvey", Id: row.Id
{SurveyID:row.ID}, }).then(res => {
res => { this.dataList = '';
if (res.data.resultCode == 1) { this.pageCount = '';
console.log(res + '111111')
if (res.Code == 1) {
that.$q.notify({ that.$q.notify({
icon: 'iconfont icon-chenggong', icon: 'iconfont icon-chenggong',
color: 'accent', color: 'accent',
...@@ -208,15 +158,15 @@ ...@@ -208,15 +158,15 @@
that.$q.notify({ that.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
message: res.data.message message: res.data.message,
}) })
} }
})
})
}, },
);
}); closeSaveForm() {
}, this.isShowWenjuan = false;
closeSaveForm(){
this.isShowWenjuan=false;
}, },
changePage(val) { changePage(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
......
src/pages/activity/questionnaireList.vue
View file @ 42bb9997
...@@ -28,23 +28,23 @@ ...@@ -28,23 +28,23 @@
<q-btn color="accent" size="sm" icon="add" label="新增" @click="addObj(null)" /> <q-btn color="accent" size="sm" icon="add" label="新增" @click="addObj(null)" />
</div> </div>
</template> </template>
<template v-slot:body-cell-IsRequired="props"> <template v-slot:body-cell-IsRequired="props">
<q-td :props="props"> <q-td :props="props">
<span v-if="props.row.IsRequired==0">否</span> <span v-if="props.row.IsRequired==0">否</span>
<span v-if="props.row.IsRequired==1">是</span> <span v-if="props.row.IsRequired==1">是</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-IsShow="props"> <template v-slot:body-cell-IsShow="props">
<q-td :props="props"> <q-td :props="props">
<span v-if="props.row.IsShow==0">是</span> <span v-if="props.row.IsShow==0">是</span>
<span v-if="props.row.IsShow==1">否</span> <span v-if="props.row.IsShow==1">否</span>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount" <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="addObj(props.row)" /> @click="addObj(props.row)" />
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
@click="delQuestion(props.row)" /> @click="delQuestion(props.row)" />
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
<wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></wenjuan-form> <wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></wenjuan-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import wenjuanForm from '../../components/activity/wenjuan-form' import wenjuanForm from '../../components/activity/wenjuan-form'
...@@ -68,100 +68,88 @@ ...@@ -68,100 +68,88 @@
}, },
data() { data() {
return { return {
columns: [ columns: [{
{
name: 'ID', name: 'ID',
label: 'ID', label: 'ID',
align: 'left', align: 'left',
field: 'ID' field: 'ID'
}, }, {
{
name: 'Title', name: 'Title',
label: '问题名称', label: '问题名称',
field: 'Title', field: 'Title',
align: 'left' align: 'left'
}, }, {
{
name: 'FormTypeStr', name: 'FormTypeStr',
label: '问卷类型', label: '问卷类型',
field: 'FormTypeStr', field: 'FormTypeStr',
align: 'left' align: 'left'
}, }, {
{
name: 'IsRequired', name: 'IsRequired',
label: '是否必填', label: '是否必填',
field: 'IsRequired', field: 'IsRequired',
align: 'left' align: 'left'
}, }, {
{
name: 'IsShow', name: 'IsShow',
label: '是否显示', label: '是否显示',
field: 'IsShow', field: 'IsShow',
align: 'left' align: 'left'
}, }, {
{
name: 'Sort', name: 'Sort',
label: '排序', label: '排序',
field: 'Sort', field: 'Sort',
align: 'left' align: 'left'
}, }, {
{
name: 'optioned', name: 'optioned',
label: '操作', label: '操作',
field: 'TId' field: 'TId'
} }],
],
dataList: [], dataList: [],
loading: true, loading: true,
ShowOpts: [{ ShowOpts: [{
label: '不限', label: '不限',
value: '-1' value: '-1'
}, }, {
{
label: '是', label: '是',
value: '0' value: '0'
}, }, {
{
label: '否', label: '否',
value: '1' value: '1'
} }],
], msg: {
msg:{ pageIndex: 1,
pageIndex:1, pageSize: 15,
pageSize:15,
rowsPerPage: 15, rowsPerPage: 15,
PrizeType:0, PrizeType: 0,
Title:'', Title: '',
IsShow:'-1', IsShow: '-1',
SurveyType:0, SurveyType: 0,
ActivitySurveyId:0,//活动id ActivitySurveyId: 0, //活动id
}, },
platList:[], platList: [],
pageCount: 0, pageCount: 0,
isShowWenjuan: false, isShowWenjuan: false,
objOption: null, objOption: null,
} }
}, },
created() { created() {},
},
mounted() { mounted() {
if(this.$route.query&&this.$route.query.ID){ if (this.$route.query && this.$route.query.ID) {
this.msg.ActivitySurveyId = this.$route.query.ID; this.msg.ActivitySurveyId = this.$route.query.ID;
} }
this.getPlat(); this.getPlat();
this.getList(); this.getList();
}, },
methods: { methods: {
getPlat(){ getPlat() {
this.apipostDS("/api/Survey/GetSurveyTypeEnumList", {}, res => { this.apipostDS("/api/Survey/GetSurveyTypeEnumList", {}, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.platList = res.data.data; this.platList = res.data.data;
let obj = { let obj = {
Id:0, Id: 0,
Name:'不限' Name: '不限'
} }
this.platList.unshift(obj); this.platList.unshift(obj);
}else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
}) })
...@@ -170,14 +158,14 @@ ...@@ -170,14 +158,14 @@
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.getList(); this.getList();
}, },
getList(){ getList() {
this.loading=true; this.loading = true;
this.apipostDS("/api/Survey/GetPageList", this.msg, res => { this.apipostDS("/api/Survey/GetPageList", this.msg, res => {
this.loading=false; this.loading = false;
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.pageCount = res.data.data.pageCount; this.pageCount = res.data.data.pageCount;
}else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
}) })
...@@ -191,7 +179,7 @@ ...@@ -191,7 +179,7 @@
this.isShowWenjuan = true; this.isShowWenjuan = true;
}, },
//删除问卷 //删除问卷
delQuestion(row){ delQuestion(row) {
let that = this; let that = this;
this.$q.dialog({ this.$q.dialog({
title: "提示", title: "提示",
...@@ -207,8 +195,9 @@ ...@@ -207,8 +195,9 @@
} }
}).onOk(() => { }).onOk(() => {
that.apipostDS( that.apipostDS(
"/api/Survey/DelSurvey", "/api/Survey/DelSurvey", {
{SurveyID:row.ID}, SurveyID: row.ID
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.$q.notify({ that.$q.notify({
...@@ -230,8 +219,8 @@ ...@@ -230,8 +219,8 @@
); );
}); });
}, },
closeSaveForm(){ closeSaveForm() {
this.isShowWenjuan=false; this.isShowWenjuan = false;
}, },
changePage(val) { changePage(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
......
src/pages/financial/reportform/performanceCommission.vue
View file @ 42bb9997
<style scoped> <style scoped>
@import "../css/cssReset.css"; @import "../css/cssReset.css";
.singeRowTable tr:nth-child(2n+1) { .singeRowTable tr:nth-child(2n + 1) {
background: none; background: none;
} }
.dd{ .dd {
background-color: #E6E6E6; background-color: #e6e6e6;
} }
.baseSet_Title { .baseSet_Title {
width: 120px !important; width: 120px !important;
padding: 18px 0 0 16px; padding: 18px 0 0 16px;
text-align: right; text-align: right;
} }
.singeRowTable tr th { .singeRowTable tr th {
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
.studentTracking td:first-child { .studentTracking td:first-child {
background-color: #E6E6E6; background-color: #e6e6e6;
position: sticky; position: sticky;
left: 0px; left: 0px;
}
} .studentTracking td:nth-child(2) {
.studentTracking td:nth-child(2) { background-color: #e6e6e6;
background-color: #E6E6E6;
position: sticky; position: sticky;
left: 109px; left: 109px;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
.studentTracking td:nth-child(3) { .studentTracking td:nth-child(3) {
background-color: #E6E6E6; background-color: #e6e6e6;
position: sticky; position: sticky;
left: 218px; left: 218px;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
.studentTracking th:first-child { .studentTracking th:first-child {
position: sticky; position: sticky;
left: 0px; left: 0px;
} }
.studentTracking th:nth-child(2) { .studentTracking th:nth-child(2) {
position: sticky; position: sticky;
left: 109px; left: 109px;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
.studentTracking th:nth-child(3) { .studentTracking th:nth-child(3) {
position: sticky; position: sticky;
left: 218px; left: 218px;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
.bj {
background-color: #e6e6e6;
}
.stulistNumber { .stulistNumber {
display: inline-block; display: inline-block;
width: 25px; width: 25px;
height: 25px; height: 25px;
text-align: center; text-align: center;
line-height: 22px; line-height: 22px;
border: 1px solid #2961FE; border: 1px solid #2961fe;
border-radius: 50%; border-radius: 50%;
cursor: pointer; cursor: pointer;
color: #2961FE; color: #2961fe;
} }
.OCourseTable { .OCourseTable {
width: 400px; width: 400px;
text-align: center; text-align: center;
} }
.OCourseTable tr td { .OCourseTable tr td {
height: 40px; height: 40px;
} }
.OCourseTable tr th { .OCourseTable tr th {
height: 40px; height: 40px;
background-color: rgb(238, 238, 239); background-color: rgb(238, 238, 239);
} }
</style> </style>
<template> <template>
<div class="page-body studentTracking"> <div class="page-body studentTracking">
...@@ -83,29 +85,56 @@ ...@@ -83,29 +85,56 @@
<div class="col-3"> <div class="col-3">
<q-field filled dense> <q-field filled dense>
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateArray" size="mini" @change="resetSearch" value-format="yyyy-MM" <el-date-picker
type="daterange" style="border:none;" range-separator="至" start-placeholder="跟进开始时间" v-model="dateArray"
end-placeholder="跟进结束时间" /> size="mini"
@change="resetSearch"
value-format="yyyy-MM"
type="daterange"
style="border:none;"
range-separator="至"
start-placeholder="跟进开始时间"
end-placeholder="跟进结束时间"
/>
</template> </template>
</q-field> </q-field>
</div> </div>
</div> </div>
</div> </div>
<div style="width: 100%;margin-top: 20px"> <div style="width: 100%;margin-top: 20px">
<div style="width: 100%;overflow-x: auto;"> <div style="width: 100%;overflow-x: auto;">
<table class="po_content singeRowTable" ref="table" style="border:1px solid #E6E6E6;" cellspacing="0" <table
cellpadding="0" v-loading="loading"> class="po_content singeRowTable"
ref="table"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<tr> <tr>
<th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">部门</th> <th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">
<th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">角色</th> 部门
<th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">人员</th> </th>
<th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">
角色
</th>
<th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">
人员
</th>
<th width="500" colspan="7" style="min-width: 500px;" v-for=" ( item , index ) in RListlength" <th
:key='index'> width="500"
<span v-if="item.Month.slice(5)<10">{{item.Month.slice(6)}}</span> colspan="7"
<span v-else>{{item.Month.slice(6)}}</span>月 style="min-width: 500px;"
v-for="(item, index) in RListlength"
:key="index"
>
<span v-if="item.Month.slice(5) < 10">{{
item.Month.slice(6)
}}</span>
<span v-else>{{ item.Month.slice(6) }}</span
>月
</th> </th>
<th width="120" rowspan="2" style="min-width: 110px;">提成合计</th> <th width="120" rowspan="2" style="min-width: 110px;">提成合计</th>
<th width="120" rowspan="2" style="min-width: 110px;">返佣合计</th> <th width="120" rowspan="2" style="min-width: 110px;">返佣合计</th>
...@@ -113,10 +142,20 @@ ...@@ -113,10 +142,20 @@
<th width="120" rowspan="2" style="min-width: 110px;">合计</th> <th width="120" rowspan="2" style="min-width: 110px;">合计</th>
</tr> </tr>
<tr> <tr>
<th v-for=" ( item , index ) in titlelist " :key='index' :width="item.Id==1?120:200">{{item.Name}}</th> <th
v-for="(item, index) in titlelist"
:key="index"
:width="item.Id == 1 ? 120 : 200"
>
{{ item.Name }}
</th>
</tr> </tr>
<tr v-for=" ( item , index ) in dataList " :key="index" <tr
v-if='dataList && dataList.length>0'> v-for="(item, index) in dataList"
:key="index"
v-if="dataList && dataList.length > 0"
:class="item.DeptName ? '' : 'bj'"
>
<td style=" border: 1px solid #d2d2d2;"> <td style=" border: 1px solid #d2d2d2;">
{{ item.DeptName }} {{ item.DeptName }}
</td> </td>
...@@ -124,31 +163,30 @@ ...@@ -124,31 +163,30 @@
<span>{{ item.RoleName }}</span> <span>{{ item.RoleName }}</span>
</td> </td>
<td> <td>
{{item.EmpName}} {{ item.EmpName }}
</td> </td>
<td v-for=" ( x , y ) in titlelist " :key="y"> <td v-for="(x, y) in titlelist" :key="y">
<div v-if="item.MonthList[x.index]"> <div v-if="item.MonthList[x.index]">
<div v-if="x.Id == 1">
<div v-if="x.Id==1"> <span>{{ item.MonthList[x.index].Achievement }}</span>
<span>{{item.MonthList[x.index].Achievement}}</span>
</div> </div>
<div v-if="x.Id==2" style="padding: 7px;"> <div v-if="x.Id == 2" style="padding: 7px;">
<span>{{item.MonthList[x.index].Rate}}</span> <span>{{ item.MonthList[x.index].Rate }}</span>
</div> </div>
<div v-if="x.Id==3" style="padding: 3px;"> <div v-if="x.Id == 3" style="padding: 3px;">
<span>{{item.MonthList[x.index].Rebate}}</span> <span>{{ item.MonthList[x.index].Rebate }}</span>
</div> </div>
<div v-if="x.Id==4" style="padding: 3px;"> <div v-if="x.Id == 4" style="padding: 3px;">
<span>{{item.MonthList[x.index].Commission}}</span> <span>{{ item.MonthList[x.index].Commission }}</span>
</div> </div>
<div v-if="x.Id==5" style="padding: 3px;"> <div v-if="x.Id == 5" style="padding: 3px;">
<span>{{item.MonthList[x.index].Brokerage}}</span> <span>{{ item.MonthList[x.index].Brokerage }}</span>
</div> </div>
<div v-if="x.Id==6" style="padding: 3px;"> <div v-if="x.Id == 6" style="padding: 3px;">
<span>{{item.MonthList[x.index].Bonus}}</span> <span>{{ item.MonthList[x.index].Bonus }}</span>
</div> </div>
<div v-if="x.Id==7" style="padding: 3px;"> <div v-if="x.Id == 7" style="padding: 3px;">
<span>{{item.MonthList[x.index].Total}}</span> <span>{{ item.MonthList[x.index].Total }}</span>
</div> </div>
</div> </div>
</td> </td>
...@@ -164,57 +202,58 @@ ...@@ -164,57 +202,58 @@
<td> <td>
<span>{{ item.TotalAll }}</span> <span>{{ item.TotalAll }}</span>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div v-if='!dataList||(dataList && dataList.length==0)' <div
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;"> v-if="!dataList || (dataList && dataList.length == 0)"
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;"
>
暂无数据 暂无数据
</div> </div>
</div> </div>
<studentRight-form v-if="isShowStuRight" :isJudgeTrans="isJudgeTrans" :BelongType="BelongType" :save-obj="stuOption" <studentRight-form
@close="closeStuForm" @success="getList" @reload="getList"> v-if="isShowStuRight"
:isJudgeTrans="isJudgeTrans"
:BelongType="BelongType"
:save-obj="stuOption"
@close="closeStuForm"
@success="getList"
@reload="getList"
>
</studentRight-form> </studentRight-form>
<studentFUForm v-if="isShowStuFU" :save-obj="stuOption" @close="closeStuForm"> <studentFUForm
v-if="isShowStuFU"
:save-obj="stuOption"
@close="closeStuForm"
>
</studentFUForm> </studentFUForm>
</div> </div>
</template> </template>
<script> <script>
import { import { GetSellAchievementsRankStat_V2 } from "../../../api/finance/index";
GetSellAchievementsRankStat_V2, import { queryCourseDropdownList } from "../../../api/course/index";
} from '../../../api/finance/index' import { queryEmployee } from "../../../api/users/user";
import { import {
queryCourseDropdownList,
} from '../../../api/course/index'
import {
queryEmployee
} from "../../../api/users/user";
import {
queryGuestStateList, queryGuestStateList,
CreateTypeList, CreateTypeList,
GetStuChannelList, GetStuChannelList,
GetCustomerList, GetCustomerList,
getGuestLearningGoalsEnumList getGuestLearningGoalsEnumList
} from "../../../api/sale/sale.js"; } from "../../../api/sale/sale.js";
import { import {
queryStuStageList, queryStuStageList,
GetStudentTypeList, GetStudentTypeList,
GetPersonalDimension, GetPersonalDimension,
getSchoolDropdown, getSchoolDropdown,
getStudentDorpDownList getStudentDorpDownList
} from "../../../api/school/index"; } from "../../../api/school/index";
import { import { EduDownLoad } from "../../../api/common/common";
EduDownLoad import studentRightForm from "../../../components/school/student/studentRight-form";
} from "../../../api/common/common"; import studentFUForm from "../../../components/school/student/studentFu-form";
import studentRightForm from "../../../components/school/student/studentRight-form"; import { mapState } from "vuex";
import studentFUForm from "../../../components/school/student/studentFu-form";
import {
mapState
} from "vuex";
export default { export default {
meta: { meta: {
title: "教师学员跟踪" title: "教师学员跟踪"
}, },
...@@ -226,11 +265,12 @@ ...@@ -226,11 +265,12 @@
data() { data() {
return { return {
msg: { msg: {
StartMonth: '', StartMonth: "",
EndMonth: '', EndMonth: ""
}, },
//归属类型列表 //归属类型列表
BelongTypeList: [{ BelongTypeList: [
{
Id: 1, Id: 1,
Name: "全部" Name: "全部"
}, },
...@@ -253,29 +293,38 @@ ...@@ -253,29 +293,38 @@
PageCount: 0, PageCount: 0,
customTypeList: [], //客户类型 customTypeList: [], //客户类型
customState: [], customState: [],
isMyStuList: [{ isMyStuList: [
Id: '-1', {
Name: '不限' Id: "-1",
}, { Name: "不限"
Id: '1', },
Name: '是' {
}, { Id: "1",
Id: '0', Name: "是"
Name: '否' },
}, ], {
hetongList: [{ Id: "0",
Id: '1', Name: "否"
Name: '正常' }
}, { ],
Id: '2', hetongList: [
Name: '退学' {
}, { Id: "1",
Id: '5', Name: "正常"
Name: '停课' },
}, { {
Id: '7', Id: "2",
Name: '毕业' Name: "退学"
}, ], },
{
Id: "5",
Name: "停课"
},
{
Id: "7",
Name: "毕业"
}
],
dateArray: [], //日期数组 dateArray: [], //日期数组
RListlength: 0, RListlength: 0,
titlelist: [], titlelist: [],
...@@ -302,19 +351,17 @@ ...@@ -302,19 +351,17 @@
myEmployeeList: [], myEmployeeList: [],
TransListData: [], //转介人数据 TransListData: [], //转介人数据
MyTransListData: [], MyTransListData: [],
goalsList: [], //学习目的列表 goalsList: [] //学习目的列表
} };
},
created() {
}, },
created() {},
mounted() { mounted() {
var d = new Date() var d = new Date();
var currentY = d.getFullYear(); var currentY = d.getFullYear();
var currentM = d.getMonth(); var currentM = d.getMonth();
var month = d.getMonth()+1; var month = d.getMonth() + 1;
this.msg.StartMonth = currentY + '-' + currentM this.msg.StartMonth = currentY + "-" + currentM;
this.msg.EndMonth = currentY + '-' + month this.msg.EndMonth = currentY + "-" + month;
this.getList(); //获取规则 this.getList(); //获取规则
// this.getStuStageList(); // this.getStuStageList();
// this.getCustomTypeList(); // this.getCustomTypeList();
...@@ -337,7 +384,8 @@ ...@@ -337,7 +384,8 @@
EduDownLoad( EduDownLoad(
"/StudentStat/DownLoadStudentFollowUp", "/StudentStat/DownLoadStudentFollowUp",
msg, msg,
"学员跟踪.xls", res => { "学员跟踪.xls",
res => {
this.loading = false; this.loading = false;
} }
); );
...@@ -447,20 +495,21 @@ ...@@ -447,20 +495,21 @@
this.RoleListData = res.Data; this.RoleListData = res.Data;
}); });
}, },
getBranchList() { //获取校区 getBranchList() {
getSchoolDropdown({}).then(res => { //获取校区
getSchoolDropdown({})
.then(res => {
var tempArray = res.Data; var tempArray = res.Data;
if (!tempArray) { if (!tempArray) {
tempArray = []; tempArray = [];
} }
tempArray.unshift({ tempArray.unshift({
SId: '-1', SId: "-1",
SName: "不限" SName: "不限"
}) });
this.CompanyList = tempArray; this.CompanyList = tempArray;
}).catch(() => {
}) })
.catch(() => {});
}, },
//获取课程 //获取课程
getCourseList() { getCourseList() {
...@@ -468,11 +517,11 @@ ...@@ -468,11 +517,11 @@
IsQPrice: 1 IsQPrice: 1
}).then(res => { }).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
let data = res.Data let data = res.Data;
this.allCourseList = JSON.parse(JSON.stringify(data)); this.allCourseList = JSON.parse(JSON.stringify(data));
this.myCourseList = JSON.parse(JSON.stringify(data)); this.myCourseList = JSON.parse(JSON.stringify(data));
} }
}) });
}, },
//获取我下属的下拉数据 //获取我下属的下拉数据
GetSubordList() { GetSubordList() {
...@@ -498,89 +547,103 @@ ...@@ -498,89 +547,103 @@
//翻页 //翻页
changePage(val) { changePage(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList() this.getList();
}, },
getList(type) { getList(type) {
this.loading = true; this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg));
if (this.dateArray && this.dateArray.length > 0) { if (this.dateArray && this.dateArray.length > 0) {
msg.StartMonth = this.dateArray[0]; msg.StartMonth = this.dateArray[0];
msg.EndMonth = this.dateArray[1]; msg.EndMonth = this.dateArray[1];
} }
GetSellAchievementsRankStat_V2(msg).then(res => { GetSellAchievementsRankStat_V2(msg)
.then(res => {
this.loading = false; this.loading = false;
this.RListlength = res.Data && res.Data[0].MonthList this.RListlength = res.Data && res.Data[0].MonthList;
this.titlelist = [{ this.titlelist = [
Name: '业绩', {
Name: "业绩",
Id: 1, Id: 1,
index: 0 index: 0
}, { },
Name: '业绩比例', {
Name: "业绩比例",
Id: 2, Id: 2,
index: 0 index: 0
}, { },
Name: '订单返佣', {
Name: "订单返佣",
Id: 3, Id: 3,
index: 0 index: 0
},{ },
Name: '提成', {
Name: "提成",
Id: 4, Id: 4,
index: 0 index: 0
}, { },
Name: '返佣金额', {
Name: "返佣金额",
Id: 5, Id: 5,
index: 0 index: 0
}, { },
Name: '人头奖励', {
Name: "人头奖励",
Id: 6, Id: 6,
index: 0 index: 0
}, { },
Name: '合计', {
Name: "合计",
Id: 7, Id: 7,
index: 0 index: 0
},]; }
];
this.dataList = res.Data; this.dataList = res.Data;
this.titlelist = []; this.titlelist = [];
for (let i = 0; i < this.RListlength.length; i++) { for (let i = 0; i < this.RListlength.length; i++) {
let obj = [{ let obj = [
Name: '业绩', {
Name: "业绩",
Id: 1, Id: 1,
index: i index: i
}, { },
Name: '业绩比例', {
Name: "业绩比例",
Id: 2, Id: 2,
index: i index: i
}, { },
Name: '订单返佣', {
Name: "订单返佣",
Id: 3, Id: 3,
index: i index: i
},{ },
Name: '提成', {
Name: "提成",
Id: 4, Id: 4,
index: i index: i
}, { },
Name: '返佣金额', {
Name: "返佣金额",
Id: 5, Id: 5,
index: i index: i
}, { },
Name: '人头奖励', {
Name: "人头奖励",
Id: 6, Id: 6,
index: i index: i
}, { },
Name: '合计', {
Name: "合计",
Id: 7, Id: 7,
index: i index: i
},]
this.titlelist = [...this.titlelist, ...obj]
} }
];
this.titlelist = [...this.titlelist, ...obj];
}
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, },
//获取客户类型 //获取客户类型
getCustomTypeList() { getCustomTypeList() {
...@@ -588,7 +651,7 @@ ...@@ -588,7 +651,7 @@
if (res.Code == 1) { if (res.Code == 1) {
this.customTypeList = res.Data; this.customTypeList = res.Data;
} }
}) });
}, },
//获取客户阶段列表 //获取客户阶段列表
getStuStageList() { getStuStageList() {
...@@ -603,10 +666,10 @@ ...@@ -603,10 +666,10 @@
}; };
this.dataList.MonthList.forEach(x => { this.dataList.MonthList.forEach(x => {
if (x.MonthNum == index + 1) { if (x.MonthNum == index + 1) {
obj = x obj = x;
} }
}) });
return obj return obj;
}, },
//点击学生姓名弹出 //点击学生姓名弹出
getStuRight(obj) { getStuRight(obj) {
...@@ -618,7 +681,7 @@ ...@@ -618,7 +681,7 @@
}, },
closeStuForm() { closeStuForm() {
this.isShowStuRight = false; this.isShowStuRight = false;
this.isShowStuFU = false this.isShowStuFU = false;
}, },
resetBelong() { resetBelong() {
if (this.msg.BelongType != 4) { if (this.msg.BelongType != 4) {
...@@ -626,17 +689,19 @@ ...@@ -626,17 +689,19 @@
this.getList(); this.getList();
} }
}, },
lookgengduo(obj, time) { //跟进备注 lookgengduo(obj, time) {
//跟进备注
//计算时间 月底日期 //计算时间 月底日期
let Month = time.split('-')[0] + '-' + time.split('-')[1] + '-01' let Month = time.split("-")[0] + "-" + time.split("-")[1] + "-01";
let date = new Date(Month); let date = new Date(Month);
let currentMonth = date.getMonth(); let currentMonth = date.getMonth();
let nextMonth = ++currentMonth; let nextMonth = ++currentMonth;
let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1); let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
let oneDay = 1000 * 60 * 60 * 24; let oneDay = 1000 * 60 * 60 * 24;
let endDate = new Date(nextMonthFirstDay - oneDay) let endDate = new Date(nextMonthFirstDay - oneDay);
let endMonth = time.split('-')[0] + '-' + time.split('-')[1] + '-' + endDate.getDate() let endMonth =
time.split("-")[0] + "-" + time.split("-")[1] + "-" + endDate.getDate();
if (obj) { if (obj) {
this.stuOption = obj; this.stuOption = obj;
this.stuOption.STime = Month; this.stuOption.STime = Month;
...@@ -644,17 +709,19 @@ ...@@ -644,17 +709,19 @@
this.BelongType = obj.BelongType; this.BelongType = obj.BelongType;
} }
this.isShowStuFU = true; this.isShowStuFU = true;
}, },
filterFnkec(val, update) { //课程的栓选 filterFnkec(val, update) {
//课程的栓选
update(() => { update(() => {
if (val === '') { if (val === "") {
this.myCourseList = this.allCourseList this.myCourseList = this.allCourseList;
} else { } else {
const needle = val.toLowerCase(); const needle = val.toLowerCase();
this.myCourseList = this.allCourseList.filter(v => v.CourseName.toLowerCase().indexOf(needle) > -1); this.myCourseList = this.allCourseList.filter(
v => v.CourseName.toLowerCase().indexOf(needle) > -1
);
} }
}) });
}, },
getCurseManager(row) { getCurseManager(row) {
let managerName = "<span class='text-grey-4'>暂未推送</span>"; let managerName = "<span class='text-grey-4'>暂未推送</span>";
...@@ -677,37 +744,36 @@ ...@@ -677,37 +744,36 @@
}); });
} }
return managerName; return managerName;
},
},
} }
}
};
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style> </style>
<style scoped> <style scoped>
/deep/.el-input__inner, /deep/.el-input__inner,
/deep/.el-range-input { /deep/.el-range-input {
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
.stics { .stics {
padding: 10px 20px; padding: 10px 20px;
background: #DDDEE0; background: #dddee0;
border-radius: 4px; border-radius: 4px;
font-size: 13px; font-size: 13px;
color: #000000; color: #000000;
font-weight: bold font-weight: bold;
} }
.stics .stics-name { .stics .stics-name {
color: #2D2D2D; color: #2d2d2d;
font-weight: 600; font-weight: 600;
margin-right: 10px margin-right: 10px;
} }
.roatImg { .roatImg {
transform: rotate(180deg); transform: rotate(180deg);
} }
</style> </style>
src/pages/financial/returnPassbook/ReturnperiodsList.vue
View file @ 42bb9997
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
<template> <template>
<el-table ref="filterTable" :data="tableData" v-loading='loading' <el-table ref="filterTable" :data="tableData" v-loading='loading'
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%"> :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
<el-table-column prop="BatchName" label="周期"></el-table-column> <el-table-column prop="BatchName" label="周期"></el-table-column>
<el-table-column v-if="isReturnperiods" prop="TotalMoney" 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 v-if="isReturnperiods" prop="TotalEmployee" label="个人直客累计金额"> </el-table-column>
...@@ -76,8 +75,8 @@ ...@@ -76,8 +75,8 @@
<el-table-column v-if="isReturnperiods" prop="CreateDate" label="创建时间"> </el-table-column> <el-table-column v-if="isReturnperiods" prop="CreateDate" label="创建时间"> </el-table-column>
<el-table-column v-if="isReturnperiods" label="财务单据"> <el-table-column v-if="isReturnperiods" label="财务单据">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.FinanceIdList" v-for="item in scope.row.FinanceIdList"> <template v-if="scope.row.FinanceIdList">
<a @click="goDetails(item)" <a v-for="(item,index) in scope.row.FinanceIdList" :key="index" @click="goDetails(item)"
style="cursor:pointer;color:blue;text-decoration:underline;display:inline-block;margin-right:10px;">{{item}}</a> style="cursor:pointer;color:blue;text-decoration:underline;display:inline-block;margin-right:10px;">{{item}}</a>
</template> </template>
</template> </template>
...@@ -88,13 +87,12 @@ ...@@ -88,13 +87,12 @@
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i> <i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
</el-tooltip> </el-tooltip>
<template v-if="isReturnperiods">
<templat v-if="isReturnperiods">
<el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''||scope.row.FinanceIds==null" <el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''||scope.row.FinanceIds==null"
content="生成财务单据" placement="top"> content="生成财务单据" placement="top">
<i class="iconfont icon-add" @click="setCommissionFinanace(scope.row.Id)"></i> <i class="iconfont icon-add" @click="setCommissionFinanace(scope.row.Id)"></i>
</el-tooltip> </el-tooltip>
</templat> </template>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
......
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