Skip to content

C
confucius
Commit d43d0c75 authored by Mac's avatar Mac
Browse files
Options

修改

parent 854e55dc
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 50 deletions
src/components/school/student/studentRight-form.vue
View file @ d43d0c75
...@@ -114,10 +114,11 @@ ...@@ -114,10 +114,11 @@
</q-tabs> </q-tabs>
<div class="operate_Content" style="flex:1;"> <div class="operate_Content" style="flex:1;">
<div class="detail_Main"> <div class="detail_Main">
<div row style="display: flex;justify-content: space-between;" v-if="ckedTab == 2">
<div <div
class="tripTypeContent" class="tripTypeContent"
style="flex-shrink:0" style="flex-shrink:0"
v-if="ckedTab == 2"
> >
<div <div
v-for="(qItem, qIndex) in visitList" v-for="(qItem, qIndex) in visitList"
...@@ -127,7 +128,17 @@ ...@@ -127,7 +128,17 @@
> >
{{ qItem.Name }} {{ qItem.Name }}
</div> </div>
</div>
<q-btn
label="咨询信息"
color="accent q-mb-lg"
size="sm"
style="margin-bottom: 0;"
@click="consultbtn"
/>
</div> </div>
<!-- 记录 --> <!-- 记录 -->
<template v-if="ckedTab == 1"> <template v-if="ckedTab == 1">
<student-record <student-record
...@@ -198,6 +209,13 @@ ...@@ -198,6 +209,13 @@
</div> </div>
</div> </div>
</div> </div>
<consultFrom
v-if="isconsult"
:save-obj="baseObj"
@close="isconsult=false"
@consultsuccess="consultsuccess"
>
</consultFrom>
<div class="dialog-out-close" @click="closeCutomer"> <div class="dialog-out-close" @click="closeCutomer">
<i class="iconfont icon-close" style="font-size:26px;" /> <i class="iconfont icon-close" style="font-size:26px;" />
</div> </div>
...@@ -220,6 +238,7 @@ import studentShiting from "../student/student-shiting"; ...@@ -220,6 +238,7 @@ import studentShiting from "../student/student-shiting";
import studentHetong from "../student/student-hetong"; import studentHetong from "../student/student-hetong";
import studentOrder from "../student/student-order"; import studentOrder from "../student/student-order";
import studentAssit from "../student/student-Assit"; import studentAssit from "../student/student-Assit";
import consultFrom from "../student/consult-from";
import { SetStudentAssistBatch } from "../../../api/sale/sale"; import { SetStudentAssistBatch } from "../../../api/sale/sale";
export default { export default {
meta: { meta: {
...@@ -234,7 +253,8 @@ export default { ...@@ -234,7 +253,8 @@ export default {
studentShiting, studentShiting,
studentHetong, studentHetong,
studentOrder, studentOrder,
studentAssit studentAssit,
consultFrom
}, },
props: { props: {
saveObj: { saveObj: {
...@@ -287,7 +307,8 @@ export default { ...@@ -287,7 +307,8 @@ export default {
customStateList: [], customStateList: [],
stateId: 0, stateId: 0,
stuData: {}, stuData: {},
userInfo: {} userInfo: {},
isconsult:false,//学生咨询弹窗
}; };
}, },
created() { created() {
...@@ -335,6 +356,15 @@ export default { ...@@ -335,6 +356,15 @@ export default {
refreshStudentPage() { refreshStudentPage() {
this.$emit("success"); this.$emit("success");
}, },
consultsuccess(data){//质询信息的修改
this.$emit("success");
this.isconsult =false;
this.baseObj.PlanPrice = data.PlanPrice;
this.baseObj.BaseCondition = data.BaseCondition;
this.baseObj.DemandPoint = data.DemandPoint;
this.baseObj.ResistPoint = data.ResistPoint;
this.baseObj.ConsultingResults = data.ConsultingResults;
},
//点击第二排 //点击第二排
getckedType(obj) { getckedType(obj) {
this.secondType = obj.Id; this.secondType = obj.Id;
...@@ -389,6 +419,7 @@ export default { ...@@ -389,6 +419,7 @@ export default {
if (res.Code == 1) { if (res.Code == 1) {
this.stuData = res.Data; this.stuData = res.Data;
this.stateId = res.Data.StuStage; this.stateId = res.Data.StuStage;
this.baseObj = res.Data
} }
}); });
}, },
...@@ -404,7 +435,11 @@ export default { ...@@ -404,7 +435,11 @@ export default {
this.baseObj.IsHaveCurseManager = true; this.baseObj.IsHaveCurseManager = true;
this.pushing = false; this.pushing = false;
}); });
} },
consultbtn(){
this.isconsult = true
},
} }
}; };
</script> </script>
......
src/pages/sale/guestConsultation.vue
View file @ d43d0c75
...@@ -75,48 +75,48 @@ th:first-child{position: sticky;left:0px;} ...@@ -75,48 +75,48 @@ th:first-child{position: sticky;left:0px;}
<template v-slot:body-cell-PlanPrice="props"> <template v-slot:body-cell-PlanPrice="props">
<q-td :props="props"> <q-td :props="props">
<el-tooltip class="item" effect="dark" :content="props.row.PlanPrice" placement="top"> <!-- <el-tooltip class="item" effect="dark" :content="props.row.PlanPrice" placement="top">
<div class="w200text">{{props.row.PlanPrice}}</div>
</el-tooltip> -->
<div class="w200text">{{props.row.PlanPrice}}</div> <div class="w200text">{{props.row.PlanPrice}}</div>
</el-tooltip>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-BaseCondition="props"> <template v-slot:body-cell-BaseCondition="props">
<q-td :props="props"> <q-td :props="props">
<!-- <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> <div class="w200text">{{props.row.BaseCondition}}</div>
</el-tooltip> <!-- <el-tooltip class="item" effect="dark" :content="props.row.BaseCondition" placement="top">
<div class="w200text">{{props.row.BaseCondition}}</div>
</el-tooltip> -->
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-DemandPoint="props"> <template v-slot:body-cell-DemandPoint="props">
<q-td :props="props"> <q-td :props="props">
<!-- <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> <div class="w200text">{{props.row.DemandPoint}}</div>
</el-tooltip> <!-- <el-tooltip class="item" effect="dark" :content="props.row.DemandPoint" placement="top">
<div class="w200text">{{props.row.DemandPoint}}</div>
</el-tooltip> -->
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-ResistPoint="props"> <template v-slot:body-cell-ResistPoint="props">
<q-td :props="props"> <q-td :props="props">
<!-- <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> <div class="w200text">{{props.row.ResistPoint}}</div>
</el-tooltip> <!-- <el-tooltip class="item" effect="dark" :content="props.row.ResistPoint" placement="top">
<div class="w200text">{{props.row.ResistPoint}}</div>
</el-tooltip> -->
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-ConsultingResults="props"> <template v-slot:body-cell-ConsultingResults="props">
<q-td :props="props"> <q-td :props="props">
<!-- <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> <div class="w200text">{{props.row.ConsultingResults}}</div>
</el-tooltip> <!-- <el-tooltip class="item" effect="dark" :content="props.row.ConsultingResults" placement="top">
<div class="w200text">{{props.row.ConsultingResults}}</div>
</el-tooltip> -->
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-FURemark="props"> <template v-slot:body-cell-FURemark="props">
<q-td > <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> <div style="max-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> <span style="text-decoration: underline;cursor: pointer;color: #2961fe ;" v-if="props.row.FURemark" @click="lookgengduo(props.row)">查看更多</span>
</q-td> </q-td>
</template> </template>
...@@ -394,14 +394,14 @@ export default { ...@@ -394,14 +394,14 @@ export default {
border: none; border: none;
} }
.w200text{ .w200text{
width: 150px; /* width: 150px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
word-wrap: normal; word-wrap: normal;
text-overflow:ellipsis; text-overflow:ellipsis;
cursor: pointer; cursor: pointer; */
/* min-width: 200px; min-width: 200px;
white-space: normal;word-break:break-all */ white-space: normal;word-break:break-all
} }
</style> </style>
src/pages/sale/studentTracking.vue
View file @ d43d0c75
...@@ -105,14 +105,14 @@ th:first-child{position: sticky;left:0px;} ...@@ -105,14 +105,14 @@ th:first-child{position: sticky;left:0px;}
<th width="120" rowspan="2" style="min-width: 120px;z-index: 999;">学生</th> <th width="120" rowspan="2" style="min-width: 120px;z-index: 999;">学生</th>
<th width="120" rowspan="2" style="min-width: 120px;">电话</th> <th width="120" 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="200" rowspan="2" style="min-width: 200px;">课程</th> <th width="200" rowspan="2" style="min-width: 200px;">所报课程</th>
<th width="80" rowspan="2" style="min-width: 80px;">基础</th> <th width="80" rowspan="2" style="min-width: 80px;">当前级别</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: 100px;">合同状态</th>
<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 >
...@@ -120,10 +120,13 @@ th:first-child{position: sticky;left:0px;} ...@@ -120,10 +120,13 @@ th:first-child{position: sticky;left:0px;}
</tr> </tr>
<tr v-for=" ( item , index ) in dataList.RList " :key="index" v-if='dataList.RList && dataList.RList.length>0'> <tr v-for=" ( item , index ) in dataList.RList " :key="index" v-if='dataList.RList && dataList.RList.length>0'>
<td style=" border: 1px solid #d2d2d2;"> <td style=" border: 1px solid #d2d2d2;">
<span>{{ item.StuName }}</span> <!-- <span>{{ item.StuName }}</span> -->
<div class="text-blue cursor-pointer" @click="getStuRight(item)">
{{ item.StuName }}
</div>
</td> </td>
<td> <td>
<span>{{ item.StuTel }}</span> <span>{{ item.StuRealMobile }}</span>
</td> </td>
<td> <td>
<span>{{ item.ContractSTime }}</span> <span>{{ item.ContractSTime }}</span>
...@@ -140,24 +143,32 @@ th:first-child{position: sticky;left:0px;} ...@@ -140,24 +143,32 @@ th:first-child{position: sticky;left:0px;}
<td> <td>
<span>{{ item.StuGuestStateName }}</span> <span>{{ item.StuGuestStateName }}</span>
</td> </td>
<td v-for=" ( x , y ) in titlelist " :key="y" :style="{'background':x.Id==1 && item.MonthList[x.index] && (item.MonthList[x.index].IsRenew==1 || item.MonthList[x.index].IntroductionNum>0)?'red':'#FFF', <td v-for=" ( x , y ) in titlelist " :key="y" >
'color':x.Id==1 && item.MonthList[x.index] && (item.MonthList[x.index].IsRenew==1 || item.MonthList[x.index].IntroductionNum>0)?'#FFF':'#111'
}">
<div v-if="item.MonthList[x.index]"> <div v-if="item.MonthList[x.index]">
<div v-if="x.Id==1" > <div v-if="x.Id==1" >
<span>{{item.MonthList[x.index].Month}}/</span> <span>{{item.MonthList[x.index].Month}}</span>
<span v-if="item.MonthList[x.index].IsRenew==1">是</span> <span style="margin:0 3px">/</span>
<span v-if="item.MonthList[x.index].IsRenew==1" style="color: red;">是</span>
<span v-if="item.MonthList[x.index].IsRenew==2">否</span> <span v-if="item.MonthList[x.index].IsRenew==2">否</span>
<span>/{{item.MonthList[x.index].IntroductionNum}}</span> <span style="margin:0 3px">/</span>
<span :style="{'color':item.MonthList[x.index].IntroductionNum>0?'red':'#111'}">{{item.MonthList[x.index].IntroductionNum}}</span>
</div> </div>
<div v-if="x.Id==2"> <div v-if="x.Id==2">
<span v-if="item.MonthList[x.index].TeacherTime">{{item.MonthList[x.index].TeacherTime+':'}}</span> <span v-if="item.MonthList[x.index].TeacherTime">{{item.MonthList[x.index].TeacherTime+':'}}</span>
<span v-if="item.MonthList[x.index].Teacher" v-html="item.MonthList[x.index].Teacher"></span> <template >
<span v-if="item.MonthList[x.index].Teacher!=''" v-html="item.MonthList[x.index].Teacher"></span>
<span v-if="item.MonthList[x.index].Teacher==''">-</span>
</template>
</div> </div>
<div v-if="x.Id==3"> <div v-if="x.Id==3">
<span v-if="item.MonthList[x.index].ConsultantTime">{{item.MonthList[x.index].ConsultantTime+':'}}</span> <span v-if="item.MonthList[x.index].ConsultantTime">{{item.MonthList[x.index].ConsultantTime+':'}}</span>
<template >
<span v-if="item.MonthList[x.index].Consultant" v-html="item.MonthList[x.index].Consultant"></span> <span v-if="item.MonthList[x.index].Consultant" v-html="item.MonthList[x.index].Consultant"></span>
<span v-if="item.MonthList[x.index].Consultant==''">-</span>
</template>
</div> </div>
</div> </div>
</td> </td>
...@@ -174,6 +185,16 @@ th:first-child{position: sticky;left:0px;} ...@@ -174,6 +185,16 @@ th:first-child{position: sticky;left:0px;}
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" <q-pagination 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
v-if="isShowStuRight"
:isJudgeTrans="isJudgeTrans"
:BelongType="BelongType"
:save-obj="stuOption"
@close="closeStuForm"
@success="getList"
@reload="getList"
>
</studentRight-form>
</div> </div>
</template> </template>
<script> <script>
...@@ -187,13 +208,15 @@ import { ...@@ -187,13 +208,15 @@ import {
GetStudentTypeList, GetStudentTypeList,
} from "../../api/school/index"; } from "../../api/school/index";
import studentRightForm from "../../components/school/student/studentRight-form";
export default { export default {
meta: { meta: {
title: "学员跟踪" title: "学员跟踪"
}, },
props: {}, props: {},
components: { components: {
studentRightForm
}, },
data() { data() {
return { return {
...@@ -222,7 +245,11 @@ export default { ...@@ -222,7 +245,11 @@ export default {
FTypeList:[{Id:'-1',Name:'不限'},{Id:'1',Name:'范围内有跟进记录'},{Id:'2',Name:'范围内没有跟进记录 '},], FTypeList:[{Id:'-1',Name:'不限'},{Id:'1',Name:'范围内有跟进记录'},{Id:'2',Name:'范围内没有跟进记录 '},],
dateArray: [], //日期数组 dateArray: [], //日期数组
RListlength:0, RListlength:0,
titlelist:[] titlelist:[],
stuOption: null,
BelongType: 1,
isShowStuRight:false,
isJudgeTrans:1,
} }
}, },
...@@ -262,7 +289,7 @@ export default { ...@@ -262,7 +289,7 @@ export default {
getStudentFollowUpPageList(msg).then(res => { getStudentFollowUpPageList(msg).then(res => {
this.loading = false; this.loading = false;
this.RListlength = res.Data.PageData && res.Data.PageData.MaxMonth?res.Data.PageData.MaxMonth: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.titlelist=[{Name:'月份/续费/转介',Id:1,index:0},{Name:'教师跟踪时间及情况说明',Id:2,index:0},{Name:'顾问跟踪时间及情况说明',Id:3,index:0},];
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
// if(this.dataList && this.dataList.RList&& this.dataList.RList.length>0){ // if(this.dataList && this.dataList.RList&& this.dataList.RList.length>0){
...@@ -274,7 +301,7 @@ export default { ...@@ -274,7 +301,7 @@ export default {
// } // }
this.titlelist=[]; this.titlelist=[];
for(let i=0;i<this.RListlength;i++){ 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},] let obj=[{Name:'月份/续费/转介',Id:1,index:i},{Name:'教师跟踪时间及情况说明',Id:2,index:i},{Name:'顾问跟踪时间及情况说明',Id:3,index:i},]
this.titlelist = [...this.titlelist, ...obj] this.titlelist = [...this.titlelist, ...obj]
} }
...@@ -306,7 +333,18 @@ export default { ...@@ -306,7 +333,18 @@ export default {
} }
}) })
return obj return obj
},
//点击学生姓名弹出
getStuRight(obj) {
if (obj) {
this.stuOption = obj;
this.BelongType = obj.BelongType;
} }
this.isShowStuRight = true;
},
closeStuForm() {
this.isShowStuRight = false;
},
}, },
} }
......
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