1

src/pages/sale/studentTracking.vue

@@ -85,20 +85,29 @@ th:first-child{position: sticky;left:0px;}
         </div>
         <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-3">
-                    <!-- <q-select @input="resetSearch" dense filled option-value="Id" option-label="Name" v-model="msg.Q_FType"
-                        :options="FTypeList" emit-value map-options label="跟进类型" /> -->
-                    <q-option-group
-                        v-model="msg.Q_FType"
-                        inline
-                        class="q-mb-md"
-                        :options="[
-                            { label: '范围内有跟进记录', value: '1' },
-                            { label: '范围内没有跟进记录', value: '2' },
                  
-                        ]"
+                <div class="col-3">
+                    <q-select  @input="resetSearch" dense filled option-value="SId" option-label="SName" v-model="msg.School_Id"
+                        :options="CompanyList" emit-value map-options label="校区"
+                    />
+                </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">
                     <q-field filled dense>
                         <template v-slot:control>
@@ -109,16 +118,18 @@ th:first-child{position: sticky;left:0px;}
                     </q-field>
                 </div>
                 <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="校区"
-                    />
-                </div>
-                <div class="col-3">
-                    <q-select filled stack-label option-value="CourseId"  option-label="CourseName" v-model="addMsg.CourseList"
-                    use-chips  use-input :options="myCourseList" label="课程" :dense="false"  class="col-6 q-pr-lg q-pb-lg" emit-value
-                    multiple  map-options @filter="filterFn"
-                />
                     
+                    <q-option-group
+                        v-model="msg.Q_FType"
+                        inline
+                        class="q-mb-md"
+                        @input="resetSearch"
+                        :options="[
+                            { label: '范围内有跟进记录', value: '1' },
+                            { label: '范围内没有跟进记录', value: '2' },
+                            
+                        ]"
+                        />
                 </div>
             </div>
         </div>
@@ -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'>
                             
                             <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>
                     </tr>
                     <tr >
@@ -252,7 +263,7 @@ th:first-child{position: sticky;left:0px;}
                         暂无数据
             </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" />
         </div>
          <studentRight-form
@@ -283,6 +294,8 @@ import {
 import {
   queryCourseDropdownList,
 } from '../../api/course/index'
+import { queryEmployee } from "../../api/users/user";
+
 import {
     queryStuStageList,
     GetStudentTypeList,
@@ -318,10 +331,12 @@ export default {
                 SFTime:'',
                 EFTime:'',
                 StuStage:'',//客户状态
-                Q_FType:'',//跟进类型 1范围内有跟进记录 2范围内没有跟进记录	
+                Q_FType:'1',//跟进类型 1范围内有跟进记录 2范围内没有跟进记录	
                 BelongType:1,
                 CreateIds: [],
                 School_Id :'-1',//校区
+                CourseId:'',//课程
+                ConsultantId:'',//课程顾问
 
             },
             //归属类型列表
@@ -350,7 +365,7 @@ export default {
             customTypeList: [], //客户类型
             customState: [],
             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: [], //日期数组
             RListlength:0,
             titlelist:[],
@@ -367,6 +382,8 @@ export default {
             CompanyList:[],
             allCourseList: [],//课程
             myCourseList:[],
+            RoleListData: [], //课程顾问下拉数据
+
 
             
 
@@ -388,9 +405,18 @@ export default {
         this.GetSubordList()
         this.getBranchList()
         this.getCourseList();//获取课程下拉
+        this.getRole()
 
     },
     methods: {
+        getRole() {
+            queryEmployee({
+                IsLeave: 1,
+                UserRole: 2
+            }).then(res => {
+                this.RoleListData = res.Data;
+            });
+        },
         getBranchList(){//获取校区
           getSchoolDropdown({}).then(res => {
             var tempArray = res.Data;
@@ -445,7 +471,7 @@ export default {
             this.getList()
 
         },
-        getList() {
+        getList(type) {
             this.loading = true;
             let msg = JSON.parse(JSON.stringify(this.msg))
             if (this.dateArray && this.dateArray.length > 0) {
@@ -464,6 +490,9 @@ export default {
              if(msg.StuStage=='' || msg.StuStage==null){
                 msg.StuStage = 0
             }
+            if(msg.ConsultantId=='' ||msg.ConsultantId == null){
+                msg.ConsultantId = 0
+            }
             
             getStudentFollowUpPageList(msg).then(res => {
                 this.loading = false;
@@ -531,7 +560,18 @@ export default {
             }
             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);
+                }
+            })
+        },
 
     },
 }