修改

src/pages/sale/channelDetail.vue

@@ -234,6 +234,7 @@
           this.$router.push({
             path: '/sale/mystu',
             query: {
+              ChannelId: row.ChannelId,
               startTime: this.msg.startTime,
               endTime: this.msg.endTime,
               empList:this.msg.empList.toString(),

src/pages/sale/mystu.vue

@@ -61,17 +61,22 @@
             option-label="EmployeeName" v-model="msg.CreateIds" multiple :options="SubordList" emit-value map-options
             label="我下属的" />
         </div>
-        
-       <q-radio value="有效"/>
-       <q-radio value="无效"/>
-
-      <q-select @input="resetSearch" dense clearable @filter="filterSubord" use-input filled option-value="Id"
-            option-label="EmployeeName" v-model="msg.CreateIds" multiple :options="SubordList" emit-value map-options
-            label="当前状态" />
+        <div class="col-3">
+          <div style="margin-top:5px;">客户状态：
+            <q-radio v-model="msg.QStudentStatus" @input="resetSearch" :val="1" label="有效" size="xs" />
+            <q-radio v-model="msg.QStudentStatus" @input="resetSearch" :val="2" label="无效" size="xs" />
+          </div>
+        </div>
+        <div class="col-3">
+          <q-select filled stack-label option-value="Id" @input="resetSearch" dense option-label="Name"
+            v-model="msg.AdvisorStatus" ref="AdvisorStatus" :options="consultList" clearable label="当前状态"
+             class="col-6 q-pb-lg" emit-value map-options />
+        </div>
       </div>
     </div>
     <div class="page-content">
-      <stulist :dataList="data" @reload="getStudent" @success="refreshPage" :loading="loading" ref="stuList" :isJudgeTrans="isJudgeTrans">
+      <stulist :dataList="data" @reload="getStudent" @success="refreshPage" :loading="loading" ref="stuList"
+        :isJudgeTrans="isJudgeTrans">
       </stulist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
@@ -99,6 +104,10 @@
   } from "../../api/users/user.js";
 
   import stulist from "../../components/school/student/stulist";
+  import {
+    GetStudentAdvisorConfigList
+  } from "../../api/customerstudent/customerstudent";
+
   import {
     getMyCustomerList,
     CreateTypeList,
@@ -138,6 +147,8 @@
           StuType: "",
           CreateIds: [],
           ExistCourseConsultant: "", //是否存在课程顾问(1-存在，2=不存在)
+          QStudentStatus: 1, //客户状态 1有效 2无效
+          AdvisorStatus: '' //当前状态
         },
         dateArray: [], //日期数组
         pageCount: 0,
@@ -180,6 +191,7 @@
         customFromList: [], //客户来源
         StuChannelList: [], //收客渠道
         allStuChannelList: [], //所有收客渠道
+        consultList:[]
       };
     },
     created() {
@@ -190,11 +202,11 @@
     },
     mounted() {
       this.currentUrl = this.$route.path;
-      if(this.$route.query.startTime){
+      if (this.$route.query.startTime) {
         this.dateArray.push(this.$route.query.startTime);
         this.msg.StartTime = this.$route.query.startTime;
       }
-      if(this.$route.query.endTime){
+      if (this.$route.query.endTime) {
         this.dateArray.push(this.$route.query.endTime);
         this.msg.EndTime = this.$route.query.endTime;
       }
@@ -202,12 +214,24 @@
       this.getCustomerList();
       this.getCustomFrom();
       this.GetStuChannelList();
+      this.getStatusList();
     },
     computed: {
       ...mapGetters(["userInfo"])
     },
 
     methods: {
+      //获取跟进状态下拉
+      getStatusList() {
+        let msg = {
+          Name: ''
+        }
+        GetStudentAdvisorConfigList(msg).then(res => {
+          if (res.Code == 1) {
+            this.consultList = res.Data;
+          }
+        })
+      },
       //获取收客渠道
       GetStuChannelList() {
         GetStuChannelList({}).then(res => {
@@ -345,9 +369,11 @@
       }
     }
   };
+
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
+
 </style>
 <style scoped>
   /deep/.el-input__inner,
@@ -355,4 +381,5 @@
     background-color: transparent;
     border: none;
   }
+
 </style>

src/pages/sale/studentTracking.vue

@@ -225,7 +225,7 @@
             <th width="100" rowspan="2" style="min-width: 100px;">收客渠道</th>
             <th width="100" rowspan="2" style="min-width: 100px;">负责人</th>
             <th width="100" rowspan="2" style="min-width: 100px;">合同状态</th>
-            <th width="100" rowspan="2" style="min-width: 100px;">期望达成协议日期</th>
+            <th width="100" rowspan="2" style="min-width: 120px;">期望达成协议日期</th>
             <th width="100" rowspan="2" style="min-width: 100px;">目前状态</th>
             <th width="100" rowspan="2" style="min-width: 100px;">胜率</th>
             <th width="100" rowspan="2" style="min-width: 100px;">跟踪记录</th>

src/pages/system/stuFlow.vue

@@ -4,7 +4,7 @@
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
         separator="none" :data="dataList" :columns="columns" row-key="name">
         <template v-slot:top>
-          <div class="col-2 q-table__title">客户阶段</div>
+          <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="addObj(null)" />