添加课程类型判断

src/views/recodeManager/recodeList.vue

@@ -199,7 +199,7 @@
           </el-table-column>
           <el-table-column align="center" label="签到状态">
             <template slot-scope="scope">
-              <div>
+              <div v-if="scope.row.courseScheduleStatus != 'NOT_START'">
                 {{ scope.row.signInStatus | attendanceType }}
               </div>
             </template>
@@ -218,7 +218,7 @@
           </el-table-column>
           <el-table-column align="center" label="签退状态">
             <template slot-scope="scope">
-              <div>
+              <div v-if="scope.row.courseScheduleStatus != 'NOT_START'">
                 {{ scope.row.signOutStatus | attendanceOutType }}
               </div>
             </template>
@@ -249,7 +249,7 @@
                 v-permission="'teacherAttendance/repealComplaints'"
               >撤销申诉</el-button>
               <el-button
-                v-if="scope.row.jobNature === 'PART_TIME' && (scope.row.complaintsStatus == null || scope.row.complaintsStatus == 3)"
+                v-if="scope.row.jobNature === 'PART_TIME' && (scope.row.complaintsStatus == null || scope.row.complaintsStatus == 3) && scope.row.courseScheduleStatus != 'NOT_START'"
                 type="text"
                 @click="appeal(scope.row)"
                 v-permission="'teacherAttendance/addComplaints'"
@@ -257,6 +257,7 @@
               <el-button
                 type="text"
                 v-permission="'teacherAttendance/update'"
+                v-if="scope.row.courseScheduleStatus != 'NOT_START'"
                 @click="hand(scope.row)"
               >处理意见</el-button>
             </template>

src/views/stuRecodeManager/index.vue

@@ -285,7 +285,7 @@
           </el-table-column>
           <el-table-column align="center" label="考勤状态">
             <template slot-scope="scope">
-              <div>
+              <div v-if="scope.row.courseSchedule && scope.row.courseSchedule.status != 'NOT_START'">
                 {{ scope.row.status | clockingIn }}
               </div>
             </template>

src/views/studentManager/components/studentRecord.vue

@@ -226,7 +226,7 @@
           </el-table-column>
           <el-table-column align="center" label="考勤状态">
             <template slot-scope="scope">
-              <div>
+              <div v-if="scope.row.courseSchedule && scope.row.courseSchedule.status != 'NOT_START'">
                 {{ scope.row.status | clockingIn }}
               </div>
             </template>

src/views/teacherManager/teacherDetail/components/resetComponent.vue

@@ -97,7 +97,7 @@
                          v-if="!scope.row.isSettlement && permission('courseSchedule/practiceCourseAdjust')&&scope.row.groupType==='PRACTICE'"
                          @click="resetClass(scope.row)">调整</el-button>
               <el-button type="text"
-                         v-if="scope.row.groupType==='PRACTICE'&&scope.row.status == 'NOT_START'&&scope.row.practiceGroup['type']!='TRIAL'&& permission('courseSchedule/practiceCourseTeacherAdjust')"
+                         v-if="scope.row.groupType==='PRACTICE'&&scope.row.status == 'NOT_START'&&(scope.row.practiceGroup && scope.row.practiceGroup['type']!='TRIAL')&& permission('courseSchedule/practiceCourseTeacherAdjust')"
                          @click="resetTeacher(scope.row)">更换老师</el-button>
             </div>
           </template>

src/views/teacherManager/teacherDetail/components/teacherNetwork.vue

@@ -70,7 +70,7 @@
                 <el-button type="text"
                            v-if="(scope.row.totalClassTimes-scope.row.currentClassTimes)>0"
                            v-permission="'courseSchedule/batchPracticeGroupTeacherAdjust?t=819'"
-                           @click="resetCourse(scope.row)">操作</el-button>
+                           @click="resetCourse(scope.row)">课程移交</el-button>
               </div>
             </template>
           </el-table-column>

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -110,15 +110,19 @@
             }}</template>
           </el-table-column>
 
-          <el-table-column align="center" label="签到">
-            <template slot-scope="scope">{{
+          <el-table-column align="center" label="签到状态">
+            <template slot-scope="scope">
+              <div v-if="scope.row.courseScheduleStatus != 'NOT_START'">{{
               scope.row.signInStatus | attendanceType
-            }}</template>
+            }}</div>
+            </template>
           </el-table-column>
-          <el-table-column align="center" label="签退">
-            <template slot-scope="scope">{{
+          <el-table-column align="center" label="签退状态">
+            <template slot-scope="scope">
+              <div v-if="scope.row.courseScheduleStatus != 'NOT_START'">{{
               scope.row.signOutStatus | attendanceOutType
-            }}</template>
+            }}</div>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -61,7 +61,7 @@
                          prop="status"
                          label="考勤状态">
           <template slot-scope="scope">
-            <div>
+            <div v-if="scope.row.courseSchedule && scope.row.courseSchedule.status != 'NOT_START'">
               <p v-if="scope.row.status">{{scope.row.status | studentRecord}}</p>
               <p v-else>未签到</p>
             </div>

src/views/teamDetail/componentCourse/teacherList.vue

@@ -44,14 +44,14 @@
                        prop="teacherPhone"
                        label="签到状态">
         <template slot-scope="scope">
-          <div>{{ scope.row.signInStatus | attendanceType}}</div>
+          <div v-if="courseStatus != 'NOT_START'">{{ scope.row.signInStatus | attendanceType}}</div>
         </template>
       </el-table-column>
       <el-table-column align='center'
                        prop="teacherPhone"
                        label="签退状态">
         <template slot-scope="scope">
-          <div>{{ scope.row.signOutStatus | attendanceOutType}}</div>
+          <div v-if="courseStatus != 'NOT_START'">{{ scope.row.signOutStatus | attendanceOutType}}</div>
         </template>
       </el-table-column>
       <el-table-column align='center'
@@ -114,23 +114,20 @@
         <template slot-scope="scope">
           <div>
             <el-button type="text"
-                       size="small"
                        v-permission="'teacherAttendance/updateTeacherAttendance'"
+                        v-if="courseStatus != 'NOT_START'"
                        @click="mackAttendance(scope.row)">补考勤</el-button>
             <el-button type="text"
-                       v-if="teachMode == 'OFFLINE'"
-                       size="small"
+                       v-if="teachMode == 'OFFLINE' && courseStatus != 'NOT_START'"
                        @click="lookGPS(scope.row)">GPS定位</el-button>
             <el-button type="text"
-                       size="small"
                        v-permission="'courseSchedule/queryTeacherSalary'"
                        @click="setCourseInfo(scope.row)">课酬调整</el-button>
               <el-button
-              size="small"
                 type="text"
                 v-permission="'teacherAttendance/update?page=teamCourseList'"
                 @click="hand(scope.row)"
-                v-if="scope.row.signInStatus!=1||scope.row.signOutStatus!=1"
+                v-if="(scope.row.signInStatus!=1||scope.row.signOutStatus!=1) && courseStatus != 'NOT_START'"
               >处理意见</el-button>
           </div>
         </template>
@@ -222,7 +219,7 @@ import gpsLoction from "../componentCourse/gpsLocation";
 import hand from '@/views/recodeManager/modals/hand'
 export default {
   components: { gpsLoction, hand },
-  props: ['courseScheduleId', 'teachMode'],
+  props: ['courseScheduleId', 'teachMode', 'courseStatus'],
   data () {
     return {
       tableList: [],
@@ -248,7 +245,7 @@ export default {
   },
   mounted () {
     this.init()
-    console.log(this.teachMode)
+    // console.log(this.teachMode, this.courseStatus)
   },
   activated () { },
   methods: {

src/views/teamDetail/components/courseList.vue

@@ -118,13 +118,13 @@
         <el-table-column align="center"
                          label="老师签到">
           <template slot-scope="scope">
-            <div>{{ scope.row.signInStatus | attendanceType}}</div>
+            <div v-if="scope.row.courseScheduleStatus != 'NOT_START'">{{ scope.row.signInStatus | attendanceType}}</div>
           </template>
         </el-table-column>
         <el-table-column align="center"
                          label="老师签退">
           <template slot-scope="scope">
-            <div>{{ scope.row.signOutStatus | attendanceOutType}}</div>
+            <div v-if="scope.row.courseScheduleStatus != 'NOT_START'">{{ scope.row.signOutStatus | attendanceOutType}}</div>
           </template>
         </el-table-column>
         <el-table-column align="center"

src/views/teamDetail/teamCourseList.vue

@@ -540,6 +540,7 @@
             <teacherList
               :courseScheduleId="maskForm.id"
               :teachMode="maskForm.teachMode"
+              :courseStatus="maskForm.status"
             ></teacherList>
           </div>
         </el-tab-pane>

src/views/withdrawal-application/modals/record.vue

@@ -94,7 +94,7 @@
       </el-table-column>
       <el-table-column align="center" label="考勤状态">
         <template slot-scope="scope">
-          <div>
+          <div v-if="scope.row.courseSchedule && scope.row.courseSchedule.status != 'NOT_START'">
             {{ scope.row.status | clockingIn }}
           </div>
         </template>