Commit 3a2a4490 authored by Mac's avatar Mac

1

parent cbc5aa55
...@@ -408,7 +408,7 @@ export default { ...@@ -408,7 +408,7 @@ export default {
border: none; border: none;
} }
.w500text{ .w500text{
min-width: 500px;
width: 500px; width: 500px;
white-space: normal;word-break:break-all white-space: normal;word-break:break-all
} }
......
...@@ -92,7 +92,7 @@ th:first-child{position: sticky;left:0px;} ...@@ -92,7 +92,7 @@ th:first-child{position: sticky;left:0px;}
/> />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" filled stack-label option-value="CourseId" option-label="CourseName" v-model="msg.CourseId" clearable emit-value <q-select @input="resetSearch" filled option-value="CourseId" option-label="CourseName" v-model="msg.CourseId" clearable emit-value
use-input :options="myCourseList" label="课程" dense use-input :options="myCourseList" label="课程" dense
map-options @filter="filterFn" map-options @filter="filterFn"
/> />
...@@ -111,9 +111,9 @@ th:first-child{position: sticky;left:0px;} ...@@ -111,9 +111,9 @@ th:first-child{position: sticky;left:0px;}
<div class="col-3"> <div class="col-3">
<q-field filled dense> <q-field filled dense>
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateArray" size="mini" @change="resetSearch" value-format="yyyy-MM-dd" <el-date-picker v-model="dateArray" size="mini" @change="resetSearch" value-format="yyyy-MM-dd"
type="daterange" style="border:none;" range-separator="至" start-placeholder="开始时间" type="daterange" style="border:none;" range-separator="至" start-placeholder="跟进开始时间"
end-placeholder="结束时间" /> end-placeholder="跟进结束时间" />
</template> </template>
</q-field> </q-field>
</div> </div>
...@@ -231,7 +231,7 @@ th:first-child{position: sticky;left:0px;} ...@@ -231,7 +231,7 @@ th:first-child{position: sticky;left:0px;}
<div v-if="x.Id==2" style="padding: 3px;"> <div v-if="x.Id==2" style="padding: 3px;">
<div v-if="item.MonthList[x.index].TeacherTime" style="display: flex;align-items: center;justify-content: space-between;"> <div v-if="item.MonthList[x.index].TeacherTime" style="display: flex;align-items: center;justify-content: space-between;">
<div >{{item.MonthList[x.index].TeacherTime}}</div> <div >{{item.MonthList[x.index].TeacherTime}}</div>
<span style="text-decoration: underline;cursor: pointer;color: #2961fe ;" @click="lookgengduo(item)">更多</span> <span style="text-decoration: underline;cursor: pointer;color: #2961fe ;" @click="lookgengduo(item,item.MonthList[x.index].TeacherTime)">更多</span>
</div> </div>
<template > <template >
<div v-if="item.MonthList[x.index].Teacher!=''" v-html="item.MonthList[x.index].Teacher"></div> <div v-if="item.MonthList[x.index].Teacher!=''" v-html="item.MonthList[x.index].Teacher"></div>
...@@ -242,7 +242,7 @@ th:first-child{position: sticky;left:0px;} ...@@ -242,7 +242,7 @@ th:first-child{position: sticky;left:0px;}
<div v-if="x.Id==3" style="padding: 3px;"> <div v-if="x.Id==3" style="padding: 3px;">
<div v-if="item.MonthList[x.index].ConsultantTime" style="display: flex;align-items: center;justify-content: space-between;"> <div v-if="item.MonthList[x.index].ConsultantTime" style="display: flex;align-items: center;justify-content: space-between;">
<div >{{item.MonthList[x.index].ConsultantTime}}</div> <div >{{item.MonthList[x.index].ConsultantTime}}</div>
<span style="text-decoration: underline;cursor: pointer;color: #2961fe ;" @click="lookgengduo(item)">更多</span> <span style="text-decoration: underline;cursor: pointer;color: #2961fe ;" @click="lookgengduo(item,item.MonthList[x.index].ConsultantTime)">更多</span>
</div> </div>
...@@ -475,11 +475,11 @@ export default { ...@@ -475,11 +475,11 @@ export default {
this.loading = true; this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg))
if (this.dateArray && this.dateArray.length > 0) { if (this.dateArray && this.dateArray.length > 0) {
msg.StartTime = this.dateArray[0]; msg.SFTime = this.dateArray[0];
msg.EndTime = this.dateArray[1]; msg.EFTime = this.dateArray[1];
} else { } else {
msg.StartTime = ""; msg.SFTime = "";
msg.EndTime = ""; msg.EFTime = "";
} }
if(msg.StuType=='' || msg.StuType==null){ if(msg.StuType=='' || msg.StuType==null){
msg.StuType = 0 msg.StuType = 0
...@@ -553,7 +553,11 @@ export default { ...@@ -553,7 +553,11 @@ export default {
this.getList(); this.getList();
} }
}, },
lookgengduo(obj){//跟进备注 lookgengduo(obj,time){//跟进备注
let Month = time.split('-')[0]+'-'+time.split('-')[1]
console.log(Month,time)
if (obj) { if (obj) {
this.stuOption = obj; this.stuOption = obj;
this.BelongType = obj.BelongType; this.BelongType = obj.BelongType;
......
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