Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/course/class.js

@@ -399,7 +399,7 @@ export function GetTeacherClassHours(data) {
  * 班级月度课耗
  * @param {JSON参数} data
  */
- export function getClassMonthStatistics(data) {
+export function getClassMonthStatistics(data) {
   return request({
     url: '/finance/GetClassMonthStatistics',
     method: 'post',
@@ -411,7 +411,7 @@ export function GetTeacherClassHours(data) {
  * 教师奖励 获取课时费老师列表
  * @param {JSON参数} data
  */
- export function getTeachingRewardsSendEmployeeList(data) {
+export function getTeachingRewardsSendEmployeeList(data) {
   return request({
     url: '/TeachingRewards/GetTeachingRewardsSendEmployeeList',
     method: 'post',
@@ -422,10 +422,21 @@ export function GetTeacherClassHours(data) {
  * 教师奖励 设置  老师已发放
  * @param {JSON参数} data
  */
- export function setTeachingRewardsSendEmployee(data) {
+export function setTeachingRewardsSendEmployee(data) {
   return request({
     url: '/TeachingRewards/SetTeachingRewardsSendEmployee',
     method: 'post',
     data
   })
+}
+/**
+ * 教师奖励 设置  老师已发放
+ * @param {JSON参数} data
+ */
+export function delLessonComment(data) {
+  return request({
+    url: '/class/DelLessonComment',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file

src/components/sale/transferclass-form.vue

@@ -472,7 +472,7 @@
           this.$q.notify({
             type: 'negative',
             position: "top",
-            message: `请选择要续费的班级`
+            message: `请选择要班级`
           })
           return;
         }
@@ -506,7 +506,7 @@
               icon: 'iconfont icon-chenggong',
               color: 'accent',
               timeout: 2000,
-              message: '转班成功！',
+              message: '转班申请成功！',
               position: 'top'
             })
             //调用父页面成功方法

src/components/teacher/stopLessonForm.vue

@@ -5,7 +5,7 @@
         <div class="text-h6">创建停课申请单</div>
       </q-card-section>
       <q-card-section class="q-pt-none">
-        <div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div>
+        <!-- <div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div> -->
         <div class="col flex items-center">
           <div class="col-2 text-grey-6">
             选择停课生效日期：
@@ -64,7 +64,6 @@
         this.msg.OrderGuestId = this.setObj.Id
         this.msg.OldStudentStatus = this.setObj.GuestState
       }
-      console.log(57, this.msg)
     },
     methods: {
       closeSaveForm() {

src/pages/course/teacherLesson.vue

@@ -333,7 +333,11 @@
               <span class="beikeBtn" v-if="AccountType&&item1.LessonPlanNum===0" @click="goBeike(item1)">备课</span>
               <span style="color:#3FC4FF;font-size:12px;cursor:pointer" v-if="item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">已反馈</span>
               <span style="color:#FFA800;font-size:12px;" v-if="item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0">未反馈</span>
-              <span class="fankuiBtn" v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">反馈</span>
+              <span class="fankuiBtn"  v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">反馈</span>
+              <span style="color:#3FC4FF;font-size:12px;margin-left:20px;cursor:pointer" v-if="item1.ParentFanKuiStatus>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">主管已反馈</span>
+              <span style="color:#FFA800;font-size:12px;margin-left:20px;" v-if="item1.ParentFanKuiStatus==0&&item1.LessonPlanNum>0">主管未反馈</span>
+             
+            
             </div>
           </div>
           <div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">

src/pages/teacher/myPrepareLessons.vue

@@ -101,11 +101,13 @@
   .teacherLesson .TeacherNameList {
     position: relative;
     color: #111111;
-    font-size:13px;
+    font-size: 13px;
   }
-  .teacherLesson .TeacherNameList:last-child{
-    height:auto;
+
+  .teacherLesson .TeacherNameList:last-child {
+    height: auto;
   }
+
   .teacherLesson .cicle1 {
     position: absolute;
     left: -15px;
@@ -158,11 +160,13 @@
 
   .teacherLesson .TeacherInfo_List {
     display: flex;
-    height:60px;
+    height: 60px;
   }
-  .teacher-box .TeacherInfo_List:last-child{
-    height:auto;
+
+  .teacher-box .TeacherInfo_List:last-child {
+    height: auto;
   }
+
   .TeacherInfo_List:last-child .timeright {
     border-left: 0 !important;
   }
@@ -219,50 +223,57 @@
     padding: 20px 20px 10px 20px;
     border-radius: 20px;
   }
-  .Teacher_Class{
+
+  .Teacher_Class {
     width: 95%;
-    height:45px;
+    height: 45px;
     background-color: #F0F5FB;
-    padding:0 20px;
-    color:#111111;
-    margin-bottom:30px;
+    padding: 0 20px;
+    color: #111111;
+    margin-bottom: 30px;
     font-weight: bold;
-    display:flex;
+    display: flex;
     align-items: center;
     justify-content: space-between;
   }
-  .Teach_BigSpan{
-    font-size:18px;
-    margin-right:20px;
+
+  .Teach_BigSpan {
+    font-size: 18px;
+    margin-right: 20px;
   }
-  .Teach_MidSpan{
-    font-size:14px;
+
+  .Teach_MidSpan {
+    font-size: 14px;
   }
-  .Plan-StartTime{
+
+  .Plan-StartTime {
     width: 100px;
-    font-size:14px;
-    color:#111111;
-    font-weight:bold;
+    font-size: 14px;
+    color: #111111;
+    font-weight: bold;
   }
-  .Plan_WeiBei{
-    color:#F44E60;
-    font-size:12px;
+
+  .Plan_WeiBei {
+    color: #F44E60;
+    font-size: 12px;
   }
-  .Teach_Circle{
+
+  .Teach_Circle {
     color: #2961FE;
     background-color: #D4DFFF;
-    display:inline-block;
-    width:24px;
-    height:24px;
-    margin:0 10px 0 30px;
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    margin: 0 10px 0 30px;
     border-radius: 50%;
     text-align: center;
     line-height: 24px;
-    font-size:12px;
+    font-size: 12px;
     position: relative;
-    top:-2px;
+    top: -2px;
   }
-  .fankuiBtn{
+
+  .fankuiBtn {
     padding: 6px 20px;
     background-color: #fff;
     color: #2961FE;
@@ -270,8 +281,9 @@
     border-radius: 5px;
     margin-left: 20px;
     cursor: pointer;
-    border:1px solid #2961FE;
+    border: 1px solid #2961FE;
   }
+
 </style>
 <template>
   <div class="page-body teacherLesson">
@@ -325,13 +337,22 @@
             </div>
             <div>
               <span v-if="item1.LessonPlanNum===0" class="Plan_WeiBei">未备课</span>
-              <span v-if="item1.LessonPlanNum>0" @click="goyibeike(item1)" style="color:#2961FE;font-size:12px;margin-right:20px;cursor:pointer;">已备课</span>
+              <span v-if="item1.LessonPlanNum>0" @click="goyibeike(item1)"
+                style="color:#2961FE;font-size:12px;margin-right:20px;cursor:pointer;">已备课</span>
               <!-- <span class="beikeBtn" v-if="item1.LessonPlanNum>0" style="backgroundColor:#3FC4FF;margin-right:20px;"
                     @click="goyibeike(item1)">已备课</span> -->
               <span class="beikeBtn" v-if="AccountType&&item1.LessonPlanNum===0" @click="goBeike(item1)">备课</span>
-              <span style="color:#3FC4FF;font-size:12px;cursor:pointer" v-if="item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">已反馈</span>
-              <span style="color:#FFA800;font-size:12px;" v-if="item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0">未反馈</span>
-              <span class="fankuiBtn" v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">反馈</span>
+              <span style="color:#3FC4FF;font-size:12px;cursor:pointer"
+                v-if="item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">已反馈</span>
+              <span style="color:#FFA800;font-size:12px;"
+                v-if="item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0">未反馈</span>
+              <span class="fankuiBtn" v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0"
+                @click="goyibeike(item1)">反馈</span>
+              <span style="color:#3FC4FF;font-size:12px;margin-left:20px;cursor:pointer"
+                v-if="item1.ParentFanKuiStatus>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">主管已反馈</span>
+              <span style="color:#FFA800;font-size:12px;margin-left:20px;"
+                v-if="item1.ParentFanKuiStatus==0&&item1.LessonPlanNum>0">主管未反馈</span>
+
             </div>
           </div>
           <div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">
@@ -521,18 +542,18 @@
         // });
         this.OpenNewUrl("/course/lessonPreparation", {
           ClassId: item.ClassId,
-          School_Id:item.School_Id,
-          ClassPlanId:item.ClassPlanId,
-          Ranks:item.Ranks
+          School_Id: item.School_Id,
+          ClassPlanId: item.ClassPlanId,
+          Ranks: item.Ranks
         });
       },
       goyibeike(item) {
         this.OpenNewUrl("/course/prepareclassDetails", {
           ClassId: item.ClassId,
-          ClassPlanId:item.ClassPlanId,
-          LessonPlanNum:item.LessonPlanNum,
-          LessonPlanSummaryNum:item.LessonPlanSummaryNum,
-          TeacherId:item.TeacherId
+          ClassPlanId: item.ClassPlanId,
+          LessonPlanNum: item.LessonPlanNum,
+          LessonPlanSummaryNum: item.LessonPlanSummaryNum,
+          TeacherId: item.TeacherId
         });
 
         // var tempStr = '/course/prepareclassDetails?ClassId=' + item.ClassId + '&ClassPlanId=' + item.ClassPlanId +