页面修改

src/components/school/student/student-consult.vue

@@ -73,11 +73,11 @@
       </div>
     </div>
     <div style="margin-left:40px;">
-      <div style="color:#ff0099">1."疑似"填入日期後...百分比自動跳30%</div>
-      <div style="color:#ff00ff">2."潛在"填入日期後~百分比自動跳50%</div>
-      <div style="color:#9933ff">3."接近"填入日期後~百分比自動跳60%</div>
-      <div style="color:#33ccff">4."談判"填入日期後~百分比自動跳80%</div>
-      <div style="color:green">5."成交"填入日期後~百分比自動跳100%</div>
+      <div style="color:#ff0099">1.“疑似”填入日期后~百分比自动跳20%；</div>
+      <div style="color:#ff00ff">2.“意向”填入日期后~百分比自动跳40%；</div>
+      <div style="color:#9933ff">3.“近期可邀约”填入日期后~百分比自动跳60%；</div>
+      <div style="color:#33ccff">4.“谈判”填入日期后~百分比自动跳80%；</div>
+      <div style="color:green">5.“签约”填入日期后~百分比自动跳100%；</div>
     </div>
     <div style="margin-bottom:20px">
       <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="page_Count" input

src/pages/sale/channelDetail.vue

@@ -22,8 +22,8 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-4 Sysuser_Date">
-          <q-field filled>
-             <template v-slot:control>
+          <q-field filled>
+            <template v-slot:control>
               <el-date-picker v-model="dateList" type="daterange" style="width:100%" :picker-options="pickerOptions0"
                 align="right" value-format="yyyy-MM-dd" @change="getData" unlink-panels range-separator="至"
                 start-placeholder="开始日期" end-placeholder="结束日期">
@@ -32,8 +32,8 @@
           </q-field>
         </div>
         <div class="col-3 Sysuser_Date">
-          <q-field filled>
-             <template v-slot:control>
+          <q-field filled>
+            <template v-slot:control>
               <el-select class="topselect" v-model="msg.empList" @change="getData" style="width:100%;" collapse-tags
                 multiple filterable placeholder="请选择">
                 <el-option v-for="item in EmployeeList" :key="item.Id" :label="item.EmployeeName" :value="item.Id">
@@ -54,7 +54,8 @@
         </el-table-column>
         <el-table-column prop="ChannelName" label="渠道名">
           <template slot-scope="scope">
-            <div class="CustomerName" v-if="scope.row.CustomerType||scope.row.ChannelType==1" @click="showDetail(scope.row)">
+            <div class="CustomerName" v-if="scope.row.CustomerType||scope.row.ChannelType==1"
+              @click="showDetail(scope.row)">
               {{scope.row.ChannelName}}
             </div>
             <div v-else>
@@ -230,18 +231,21 @@
       },
       //客户详情
       showDetail(row) {
-        if(row.ChannelType==1){
-          this.$router.push({
-            path: '/sale/mystu',
-            query: {
-              ChannelId: row.ChannelId,
-              startTime: this.msg.startTime,
-              endTime: this.msg.endTime,
-              empList:this.msg.empList.toString(),
-              blank: 'y'
-            }
+        if (row.ChannelType == 1) {
+          var url = "/sale/mystu";
+          if (this.CurrentUserInfo && (this.CurrentUserInfo.IsMarket == 1 || this.CurrentUserInfo.IsCourseConsultant ==
+              1)) {
+            url = "/sale/mystu";
+          } else {
+            url = '/school/student';
+          }
+          this.OpenNewUrl(url, {
+            ChannelId: row.ChannelId,
+            startTime: this.msg.startTime,
+            endTime: this.msg.endTime,
+            empList: this.msg.empList.toString(),
           })
-        }else{
+        } else {
           this.curRowId = row.ChannelId;
           this.isShowDetailForm = true;
         }

src/pages/school/student.vue

@@ -4,7 +4,8 @@
     width: 100%;
     border: none;
   }
-  .Sysuser_Date .el-range-input{
+
+  .Sysuser_Date .el-range-input {
     background-color: transparent;
   }
 </style>
@@ -25,8 +26,8 @@
           <q-input @input="resetSearch" dense clearable filled v-model="msg.WechatNo" label="微信号" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" dense filled v-model="msg.StuType" :options="customTypeList" option-label="Name"
-            option-value="Id" emit-value map-options label="客户类型" clearable />
+          <q-select @input="resetSearch" dense filled v-model="msg.StuType" :options="customTypeList"
+            option-label="Name" option-value="Id" emit-value map-options label="客户类型" clearable />
         </div>
         <div class="col-3">
           <q-select @input="resetSearch" dense filled v-model="msg.CreateBy" @filter="filterEmployee" use-input
@@ -40,15 +41,17 @@
         <div class="col-3 Sysuser_Date">
           <q-field filled dense>
              <template v-slot:control>
-              <el-date-picker v-model="dateArray" size="mini" @change="resetSearch" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="开始时间"  end-placeholder="结束时间" />    
+              <el-date-picker v-model="dateArray" size="mini"  @change="resetSearch"  value-format="yyyy-MM-dd"
+                 type="daterange"  style="border:none;"  range-separator="至"  start-placeholder="开始时间"
+                 end-placeholder="结束时间" />    
             </template>
           </q-field>
         </div>
         <div class="col-3">
           <q-field filled label="客户状态" dense stack-label>
             <template v-slot:control>
-              <q-radio dense v-model="msg.QStudentStatus" @input="resetSearch" :val="1" label="有效" size="xs" /> &nbsp;&nbsp;
+              <q-radio dense v-model="msg.QStudentStatus" @input="resetSearch" :val="1" label="有效" size="xs" />
+              &nbsp;&nbsp;
               <q-radio dense v-model="msg.QStudentStatus" @input="resetSearch" :val="2" label="无效" size="xs" />
             </template>
           </q-field>
@@ -61,7 +64,8 @@
       </div>
     </div>
     <div class="page-content">
-      <stulist :dataList="data" @success="refreshPage" :loading="loading" ref="stuList" :authObj="AuthObj" :queryMsg="msg">
+      <stulist :dataList="data" @success="refreshPage" :loading="loading" ref="stuList" :authObj="AuthObj"
+        :queryMsg="msg">
       </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"
@@ -91,7 +95,9 @@
     GetStudentAdvisorConfigList
   } from "../../api/customerstudent/customerstudent";
   import stulist from '../../components/school/student/stulist'
-  import { mapGetters } from "vuex";
+  import {
+    mapGetters
+  } from "vuex";
 
   export default {
     meta: {
@@ -115,11 +121,12 @@
           StuStage: "", //客户阶段
           StartTime: "", //开始时间
           EndTime: "", //结束时间
-          QQ:'',
-          WechatNo:'',
-          StuType:'',
+          QQ: '',
+          WechatNo: '',
+          StuType: '',
           QStudentStatus: 1, //客户状态 1有效 2无效
-          AdvisorStatus: '' //当前状态
+          AdvisorStatus: '', //当前状态
+          StuChannel:"",
         },
         dateArray: [], //日期数组
         pageCount: 0,
@@ -128,10 +135,10 @@
         //客户阶段状态列表
         customState: [],
         customTypeList: [], //客户类型
-        AuthObj:{
-          isShowDownload:true,
+        AuthObj: {
+          isShowDownload: true,
         },
-        consultList:[]
+        consultList: []
       }
     },
     computed: {
@@ -143,7 +150,18 @@
       this.getCustomTypeList();
     },
     mounted() {
-      this.currentUrl = this.$route.path
+      this.currentUrl = this.$route.path;
+      if (this.$route.query.startTime) {
+        this.dateArray.push(this.$route.query.startTime);
+        this.msg.StartTime = this.$route.query.startTime;
+      }
+      if (this.$route.query.endTime) {
+        this.dateArray.push(this.$route.query.endTime);
+        this.msg.EndTime = this.$route.query.endTime;
+      }
+      if (this.$route.query.ChannelId) {
+        this.msg.StuChannel = this.$route.query.ChannelId;
+      }
       this.getStatusList();
       this.getStudent()
     },
@@ -166,7 +184,7 @@
         })
       },
       //获取客户类型
-      getCustomTypeList(){
+      getCustomTypeList() {
         GetStudentTypeList().then(res => {
           if (res.Code == 1) {
             this.customTypeList = res.Data;