1

src/pages/sale/guestConsultation.vue

@@ -56,7 +56,7 @@ th:first-child{position: sticky;left:0px;}
         </div>
          <div  class="page-content">
                 <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat 
-                 class="sticky-right-column-table sticky-tow-column-table" separator="none"
+                 class="sticky-right-column-table sticky-tow-column-table" separator="none" :separator="cell"
                     :data="dataList" :columns="columns" row-key="StuId" >
                     
                    
@@ -74,39 +74,56 @@ th:first-child{position: sticky;left:0px;}
                     </template>
                     <template v-slot:body-cell-PlanPrice="props">
                         <q-td :props="props">
-                            <div class="w200text">{{props.row.PlanPrice}}</div>
+                        
+                            <el-tooltip class="item" effect="dark" :content="props.row.PlanPrice" placement="top">
+                                <div class="w200text">{{props.row.PlanPrice}}</div>
+                            </el-tooltip>
+                            
                         </q-td>
                     </template>
                     <template v-slot:body-cell-BaseCondition="props">
                         <q-td :props="props">
-                            <div class="w200text">{{props.row.BaseCondition}}</div>
+                            <!-- <div class="w200text">{{props.row.BaseCondition}}</div> -->
+                            <el-tooltip class="item" effect="dark" :content="props.row.BaseCondition" placement="top">
+                                <div class="w200text">{{props.row.BaseCondition}}</div>
+                            </el-tooltip>
                         </q-td>
                     </template>
                     <template v-slot:body-cell-DemandPoint="props">
                         <q-td :props="props">
-                            <div class="w200text">{{props.row.DemandPoint}}</div>
+                            <!-- <div class="w200text">{{props.row.DemandPoint}}</div> -->
+                            <el-tooltip class="item" effect="dark" :content="props.row.DemandPoint" placement="top">
+                                <div class="w200text">{{props.row.DemandPoint}}</div>
+                            </el-tooltip>
                         </q-td>
                     </template>
                     <template v-slot:body-cell-ResistPoint="props">
                         <q-td :props="props">
-                            <div class="w200text">{{props.row.ResistPoint}}</div>
+                            <!-- <div class="w200text">{{props.row.ResistPoint}}</div> -->
+                            <el-tooltip class="item" effect="dark" :content="props.row.ResistPoint" placement="top">
+                                <div class="w200text">{{props.row.ResistPoint}}</div>
+                            </el-tooltip>
                         </q-td>
                     </template>
                     <template v-slot:body-cell-ConsultingResults="props">
                         <q-td :props="props">
-                            <div class="w200text">{{props.row.ConsultingResults}}</div>
+                            <!-- <div class="w200text">{{props.row.ConsultingResults}}</div> -->
+                            <el-tooltip class="item" effect="dark" :content="props.row.ConsultingResults" placement="top">
+                                <div class="w200text">{{props.row.ConsultingResults}}</div>
+                            </el-tooltip>
                         </q-td>
                     </template>
                    
                     <template v-slot:body-cell-FURemark="props">
-                        <q-td>
-                            <span v-if="props.row.FURemark" v-html="props.row.FURemark"></span>
+                        <q-td >
+                            <div  style="width: 200px;overflow: hidden;white-space:	normal;word-break:break-all;max-height: 40px;" v-if="props.row.FURemark" v-html="props.row.FURemark"></div>
                             <span style="text-decoration: underline;cursor: pointer;color: #2961fe ;" v-if="props.row.FURemark" @click="lookgengduo(props.row)">查看更多</span>
                         </q-td>
                     </template>
                     <template v-slot:bottom>
                         <div></div>
                     </template>
+                    
                 </q-table>
             </div>
               <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount"
@@ -377,9 +394,14 @@ export default {
     border: none;
   }
   .w200text{
-      max-width: 260px;
-      min-width: 200px;
-      white-space:	normal;word-break:break-all
+      width: 150px;
+      overflow: hidden;
+      white-space: nowrap;
+    word-wrap: normal;
+    text-overflow:ellipsis;
+    cursor: pointer;
+      /* min-width: 200px;
+      white-space:	normal;word-break:break-all */
   }
  
 </style>

src/pages/sale/studentTracking.vue

@@ -68,15 +68,15 @@ th:first-child{position: sticky;left:0px;}
                 </div>
                 <div class="col stics">
                     <span class="stics-name">续费数量</span>
-                    <span>{{dataList.Stat.RenewNum?dataList.Stat.RenewNum:0}}人</span>
+                    <span style="color: #F72E52">{{dataList.Stat.RenewNum?dataList.Stat.RenewNum:0}}人</span>
                 </div>
                 <div class="col stics">
                     <span class="stics-name">新生数量</span>
-                    <span style="color: #F72E52">{{dataList.Stat.NewNum?dataList.Stat.NewNum:0}}人</span>
+                    <span style="color:#2961FE;">{{dataList.Stat.NewNum?dataList.Stat.NewNum:0}}人</span>
                 </div>
                 <div class="col stics">
                     <span class="stics-name">学习中数量</span>
-                    <span style="color:#2961FE;">{{dataList.Stat.StudyNum?dataList.Stat.StudyNum:0}}人</span>
+                    <span >{{dataList.Stat.StudyNum?dataList.Stat.StudyNum:0}}人</span>
                 </div>
                 <div class="col stics">
                     <span class="stics-name">毕业数量</span>
@@ -110,7 +110,9 @@ th:first-child{position: sticky;left:0px;}
                         <th width="100" rowspan="2" style="min-width: 100px;">生日</th>
                         <th width="100" rowspan="2" style="min-width: 100px;">状态</th>
                         <th width="500" colspan="3" style="min-width: 500px;" v-for=" ( item , index ) in RListlength " :key = 'index'>
-                            第{{index+1}}个月
+                            
+                            <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>
                         </th>
                     </tr>
                     <tr >
@@ -259,17 +261,17 @@ export default {
             }
             getStudentFollowUpPageList(msg).then(res => {
                 this.loading = false;
-                this.RListlength = 1;
+                this.RListlength = res.Data.PageData && res.Data.PageData.MaxMonth?res.Data.PageData.MaxMonth:1;
                 this.titlelist=[{Name:'月份/续费/介绍数量',Id:1,index:0},{Name:'教师跟进',Id:2,index:0},{Name:'顾问跟进',Id:3,index:0},];
                 this.dataList = res.Data.PageData;
                 this.PageCount = res.Data.PageCount;
-                if(this.dataList && this.dataList.RList&& this.dataList.RList.length>0){
-                    this.dataList.RList.forEach(x=>{
-                        if(x.MonthList.length> this.RListlength){
-                            this.RListlength = x.MonthList.length
-                        }
-                    })
-                }
+                // if(this.dataList && this.dataList.RList&& this.dataList.RList.length>0){
+                //     this.dataList.RList.forEach(x=>{
+                //         if(x.MonthList.length> this.RListlength){
+                //             this.RListlength = x.MonthList.length
+                //         }
+                //     })
+                // }
                 this.titlelist=[];
                 for(let i=0;i<this.RListlength;i++){
                     let obj=[{Name:'月份/续费/介绍数量',Id:1,index:i},{Name:'教师跟进',Id:2,index:i},{Name:'顾问跟进',Id:3,index:i},]
@@ -296,6 +298,15 @@ export default {
                 this.customState = res.Data;
             });
         },
+        getxuyue(index){
+            let obj= {IntroductionNum:0,RenewNum:0};
+            this.dataList.MonthList.forEach(x=>{
+                if(x.MonthNum == index+1){
+                    obj = x
+                }
+            })
+            return obj
+        }
 
     },
 }