页面修改

src/pages/sale/studentTracking.vue

@@ -21,6 +21,7 @@
     position: sticky;
     left: 0px;
   }
+
   .stulistNumber {
     display: inline-block;
     width: 25px;
@@ -32,6 +33,7 @@
     cursor: pointer;
     color: #2961FE;
   }
+
   .OCourseTable {
     width: 400px;
     text-align: center;
@@ -102,25 +104,27 @@
               :options="CompanyList" emit-value map-options label="校区" />
           </div>
           <div class="col-3">
-          <q-select @input="resetSearch" filled option-value="CourseId" option-label="CourseName" v-model="msg.CourseId"
-            clearable emit-value use-input :options="myCourseList" label="课程" dense map-options @filter="filterFnkec" />
+            <q-select @input="resetSearch" filled option-value="CourseId" option-label="CourseName"
+              v-model="msg.CourseId" clearable emit-value use-input :options="myCourseList" label="课程" dense map-options
+              @filter="filterFnkec" />
           </div>
           <div class="col-3">
             <q-select @input="resetSearch" dense filled option-value="Id" option-label="EmployeeName"
               v-model="msg.ConsultantId" clearable :options="RoleListData" emit-value map-options label="课程顾问" />
           </div>
           <div class="col-3">
-          <q-select @input="resetSearch" dense filled option-value="Id" option-label="Name" v-model="msg.StuGuestState"
-            clearable :options="hetongList" emit-value map-options label="合同状态" />
+            <q-select @input="resetSearch" dense filled option-value="Id" option-label="Name"
+              v-model="msg.StuGuestState" clearable :options="hetongList" emit-value map-options label="合同状态" />
           </div>
           <div class="col-3">
-          <q-select @input="msg.StuSourceId='',msg.StuChannel='',resetSearch()" dense clearable filled option-value="Id"
-            option-label="Name" v-model="msg.CreateType" :options="customFromList" emit-value map-options
-            label="客户来源" />
+            <q-select @input="msg.StuSourceId='',msg.StuChannel='',resetSearch()" dense clearable filled
+              option-value="Id" option-label="Name" v-model="msg.CreateType" :options="customFromList" emit-value
+              map-options label="客户来源" />
           </div>
           <div class="col-3" v-if="msg.CreateType==1">
             <q-select filled v-model="msg.StuChannel" @input="resetSearch" label="收客渠道" dense :options="StuChannelList"
-            option-label="Name" option-value="Id" emit-value map-options use-input clearable @filter="filterStuChannel">
+              option-label="Name" option-value="Id" emit-value map-options use-input clearable
+              @filter="filterStuChannel">
               <template v-slot:no-option>
                 <q-item>
                   <q-item-section class="text-grey">
@@ -212,9 +216,11 @@
             <th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">学生</th>
             <th width="120" rowspan="2" style="min-width: 110px;">电话</th>
             <th width="120" rowspan="2" style="min-width: 110px;">课程顾问</th>
-            <th width="120" rowspan="2" style="min-width: 110px;">协助老师</th>
+            <th width="120" rowspan="2" style="min-width: 110px;">班主任</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="200" rowspan="2" style="min-width: 200px;">结课时间</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>
@@ -260,6 +266,12 @@
             <td>
               <span>{{ item.CourseName }}</span>
             </td>
+            <td>
+              <span>{{ item.BeginClassDate }}</span>
+            </td>
+            <td>
+              <span>{{ item.GraduationTime }}</span>
+            </td>
             <td>
               <span>{{ item.JapanBaseInfo }}</span>
             </td>
@@ -910,11 +922,9 @@
 
     },
   }
-
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-
 </style>
 <style scoped>
   /deep/.el-input__inner,
@@ -941,5 +951,4 @@
   .roatImg {
     transform: rotate(180deg);
   }
-
 </style>
\ No newline at end of file

src/pages/teacher/teacherTrack.vue

@@ -223,13 +223,11 @@
             <th width="120" rowspan="2" style="min-width: 110px;">班主任</th>
             <th width="100" rowspan="2" style="min-width: 100px;">合同时间</th>
             <th width="200" rowspan="2" style="min-width: 200px;">所报课程</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="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="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 "
@@ -277,16 +275,9 @@
             <td>
               <span>{{ item.StuBirthStr }}</span>
             </td>
-            <td>
-              <span>{{ item.CreateTypeName?item.CreateTypeName:'-' }}</span>
-            </td>
             <td>
               {{item.StuPurposeName}}
             </td>
- 
-            <td>
-              <span>{{ item.StuChannelName?item.StuChannelName:'-' }}</span>
-            </td>
             <td>
               <span>{{ item.CreateByName?item.CreateByName:'-' }}</span>
             </td>