Commit cbc5aa55 authored by Mac's avatar Mac

1

parent 7cf7879a
...@@ -85,20 +85,29 @@ th:first-child{position: sticky;left:0px;} ...@@ -85,20 +85,29 @@ th:first-child{position: sticky;left:0px;}
</div> </div>
<div class="page-search row items-center" v-if="morequery"> <div class="page-search row items-center" v-if="morequery">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<!-- <q-select @input="resetSearch" dense filled option-value="Id" option-label="Name" v-model="msg.Q_FType" <div class="col-3">
:options="FTypeList" emit-value map-options label="跟进类型" /> --> <q-select @input="resetSearch" dense filled option-value="SId" option-label="SName" v-model="msg.School_Id"
<q-option-group :options="CompanyList" emit-value map-options label="校区"
v-model="msg.Q_FType" />
inline
class="q-mb-md"
:options="[
{ label: '范围内有跟进记录', value: '1' },
{ label: '范围内没有跟进记录', value: '2' },
]"
/>
</div> </div>
<div class="col-3">
<q-select @input="resetSearch" filled stack-label option-value="CourseId" option-label="CourseName" v-model="msg.CourseId" clearable emit-value
use-input :options="myCourseList" label="课程" dense
map-options @filter="filterFn"
/>
</div>
<div class="col-3">
<q-select @input="resetSearch" dense filled option-value="Id" option-label="EmployeeName" v-model="msg.ConsultantId" clearable
:options="RoleListData" emit-value map-options label="课程顾问"
/>
</div>
<div class="col-3">
<q-select @input="resetSearch" dense filled option-value="Id" option-label="Name" v-model="msg.StuGuestState" clearable
:options="hetongList" emit-value map-options label="合同状态"
/>
</div>
<div class="col-3"> <div class="col-3">
<q-field filled dense> <q-field filled dense>
<template v-slot:control> <template v-slot:control>
...@@ -109,16 +118,18 @@ th:first-child{position: sticky;left:0px;} ...@@ -109,16 +118,18 @@ th:first-child{position: sticky;left:0px;}
</q-field> </q-field>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetBelong" dense filled option-value="SId" option-label="SName" v-model="msg.School_Id"
:options="CompanyList" emit-value map-options label="校区" <q-option-group
/> v-model="msg.Q_FType"
</div> inline
<div class="col-3"> class="q-mb-md"
<q-select filled stack-label option-value="CourseId" option-label="CourseName" v-model="addMsg.CourseList" @input="resetSearch"
use-chips use-input :options="myCourseList" label="课程" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value :options="[
multiple map-options @filter="filterFn" { label: '范围内有跟进记录', value: '1' },
/> { label: '范围内没有跟进记录', value: '2' },
]"
/>
</div> </div>
</div> </div>
</div> </div>
...@@ -175,7 +186,7 @@ th:first-child{position: sticky;left:0px;} ...@@ -175,7 +186,7 @@ th:first-child{position: sticky;left:0px;}
<th width="500" colspan="3" style="min-width: 500px;" v-for=" ( item , index ) in RListlength " :key = 'index'> <th width="500" colspan="3" style="min-width: 500px;" v-for=" ( item , index ) in RListlength " :key = 'index'>
<div>第{{index+1}}个月</div> <div>第{{index+1}}个月</div>
<div v-if="dataList.MonthList">(续约: <span style="color: #F72E52">{{getxuyue(index).RenewNum}} </span> <span style="margin-left: 5px;">学员介绍:{{getxuyue(index).IntroductionNum}}</span>) </div> <div v-if="dataList.MonthList">(累计续约:<span style="color: #F72E52">{{getxuyue(index).RenewNum}} </span> <span style="margin-left: 5px;">学员介绍:{{getxuyue(index).IntroductionNum}}</span>) </div>
</th> </th>
</tr> </tr>
<tr > <tr >
...@@ -247,12 +258,12 @@ th:first-child{position: sticky;left:0px;} ...@@ -247,12 +258,12 @@ th:first-child{position: sticky;left:0px;}
</div> </div>
<div v-if='!dataList.RList||(dataList.RList && dataList.RList.length==0)' <div v-if='!dataList.RList||(dataList.RList && dataList.RList.length==0)'
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;"> style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;">
暂无数据 暂无数据
</div> </div>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" <q-pagination v-if='dataList.RList && dataList.RList.length>0' class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount"
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</div> </div>
<studentRight-form <studentRight-form
...@@ -283,6 +294,8 @@ import { ...@@ -283,6 +294,8 @@ import {
import { import {
queryCourseDropdownList, queryCourseDropdownList,
} from '../../api/course/index' } from '../../api/course/index'
import { queryEmployee } from "../../api/users/user";
import { import {
queryStuStageList, queryStuStageList,
GetStudentTypeList, GetStudentTypeList,
...@@ -318,10 +331,12 @@ export default { ...@@ -318,10 +331,12 @@ export default {
SFTime:'', SFTime:'',
EFTime:'', EFTime:'',
StuStage:'',//客户状态 StuStage:'',//客户状态
Q_FType:'',//跟进类型 1范围内有跟进记录 2范围内没有跟进记录 Q_FType:'1',//跟进类型 1范围内有跟进记录 2范围内没有跟进记录
BelongType:1, BelongType:1,
CreateIds: [], CreateIds: [],
School_Id :'-1',//校区 School_Id :'-1',//校区
CourseId:'',//课程
ConsultantId:'',//课程顾问
}, },
//归属类型列表 //归属类型列表
...@@ -350,7 +365,7 @@ export default { ...@@ -350,7 +365,7 @@ export default {
customTypeList: [], //客户类型 customTypeList: [], //客户类型
customState: [], customState: [],
isMyStuList:[{Id:'-1',Name:'不限'},{Id:'1',Name:'是'},{Id:'0',Name:'否'},], isMyStuList:[{Id:'-1',Name:'不限'},{Id:'1',Name:'是'},{Id:'0',Name:'否'},],
FTypeList:[{Id:'-1',Name:'不限'},{Id:'1',Name:'范围内有跟进记录'},{Id:'2',Name:'范围内没有跟进记录 '},], hetongList:[{Id:'1',Name:'正常'},{Id:'2',Name:'退学'},{Id:'5',Name:'停课'},{Id:'7',Name:'毕业'},],
dateArray: [], //日期数组 dateArray: [], //日期数组
RListlength:0, RListlength:0,
titlelist:[], titlelist:[],
...@@ -367,6 +382,8 @@ export default { ...@@ -367,6 +382,8 @@ export default {
CompanyList:[], CompanyList:[],
allCourseList: [],//课程 allCourseList: [],//课程
myCourseList:[], myCourseList:[],
RoleListData: [], //课程顾问下拉数据
...@@ -388,9 +405,18 @@ export default { ...@@ -388,9 +405,18 @@ export default {
this.GetSubordList() this.GetSubordList()
this.getBranchList() this.getBranchList()
this.getCourseList();//获取课程下拉 this.getCourseList();//获取课程下拉
this.getRole()
}, },
methods: { methods: {
getRole() {
queryEmployee({
IsLeave: 1,
UserRole: 2
}).then(res => {
this.RoleListData = res.Data;
});
},
getBranchList(){//获取校区 getBranchList(){//获取校区
getSchoolDropdown({}).then(res => { getSchoolDropdown({}).then(res => {
var tempArray = res.Data; var tempArray = res.Data;
...@@ -445,7 +471,7 @@ export default { ...@@ -445,7 +471,7 @@ export default {
this.getList() this.getList()
}, },
getList() { 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) {
...@@ -464,6 +490,9 @@ export default { ...@@ -464,6 +490,9 @@ export default {
if(msg.StuStage=='' || msg.StuStage==null){ if(msg.StuStage=='' || msg.StuStage==null){
msg.StuStage = 0 msg.StuStage = 0
} }
if(msg.ConsultantId=='' ||msg.ConsultantId == null){
msg.ConsultantId = 0
}
getStudentFollowUpPageList(msg).then(res => { getStudentFollowUpPageList(msg).then(res => {
this.loading = false; this.loading = false;
...@@ -531,7 +560,18 @@ export default { ...@@ -531,7 +560,18 @@ export default {
} }
this.isShowStuFU = true; this.isShowStuFU = true;
} },
filterFn(val, update) {//课程的栓选
update(() => {
if (val === '') {
this.myCourseList = this.allCourseList
}
else {
const needle = val.toLowerCase();
this.myCourseList = this.allCourseList.filter(v => v.CourseName.toLowerCase().indexOf(needle) > -1);
}
})
},
}, },
} }
......
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