Merge branch 'fix-coursestatus'

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

@@ -52,14 +52,35 @@
           v-model.trim="searchForm.signInStatus"
           filterable
           clearable
-          placeholder="考勤状态"
+          placeholder="签到状态"
         >
-          <el-option
+          <el-option :value="1" label="正常签到"></el-option>
+          <el-option :value="0" label="异常签到"></el-option>
+          <el-option :value="3" label="未签到"></el-option>
+          <!-- <el-option
             v-for="(item, index) in attendance"
             :key="index"
             :label="item.label"
             :value="item.value"
-          ></el-option>
+          ></el-option> -->
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select
+          v-model.trim="searchForm.signOutStatus"
+          filterable
+          clearable
+          placeholder="签退状态"
+        >
+          <!-- <el-option
+            v-for="(item, index) in attendance"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option> -->
+          <el-option :value="1" label="正常签退"></el-option>
+          <el-option :value="0" label="异常签退"></el-option>
+          <el-option :value="3" label="未签退"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -110,15 +131,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.courseStatus != '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.courseStatus != 'NOT_START'">{{
               scope.row.signOutStatus | attendanceOutType
-            }}</template>
+            }}</div>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -161,6 +186,7 @@ export default {
         classGroupName: null,
         courseScheduleType: null,
         signInStatus: null,
+        signOutStatus: null,
         courseDate:[]
       },
       tableList: [],
@@ -222,6 +248,7 @@ export default {
         classGroupName: null,
         courseScheduleType: null,
         signInStatus: null,
+        signOutStatus: null
       };
       this.getList()
     },

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -156,8 +156,8 @@
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.offlineClassesSalary"
                         placeholder="请输入内容">
-                <template slot="append" v-if="scope.row.musicTheory"> 元/人</template>
-                <template slot="append" v-else>节/人</template>
+                <template slot="append"> 元/人</template>
+                <!-- <template slot="append" v-else>节/人</template>  v-if="scope.row.musicTheory" -->
               </el-input>
               </div>
 

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/studentWork.vue

@@ -11,8 +11,8 @@
     <el-form :inline="true" class="workForm" style="padding: 0 25px">
       <el-form-item label="应交学生数">
         <!-- <el-input disabled
-        :value="studentNum"></el-input>-->
-        <div class="inputStyle">{{ studentNum }}</div>
+        :value="homeworkStudentNum"></el-input>-->
+        <div class="inputStyle">{{ homeworkStudentNum }}</div>
       </el-form-item>
       <el-form-item label="已交学生数">
         <!-- <el-input disabled
@@ -70,7 +70,7 @@
         </el-table-column>
         <el-table-column align="center" prop="isView" label="是否提交">
           <template slot-scope="scope">
-            <div>{{ scope.row.createTime ? "是" : "否" }}</div>
+            <div>{{ scope.row.submitTime ? "是" : "否" }}</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="isView" label="是否查看">
@@ -89,7 +89,7 @@
               <!--   -->
               <el-button
                 type="text"
-                v-if="scope.row.urlList && scope.row.createTime"
+                v-if="scope.row.urlList && scope.row.submitTime"
                 @click="lookWork(scope.row)"
                 >查看作业</el-button
               >
@@ -230,6 +230,7 @@ export default {
       workVisible: false,
       repliedVisible: false,
       studentNum: null,
+      homeworkStudentNum: null,
       homeworkNum: null,
       repliedNum: null,
       activeUrl: null,
@@ -272,6 +273,7 @@ export default {
         (res) => {
           if (res.code == 200) {
             this.studentNum = res.data.studentNum;
+            this.homeworkStudentNum = res.data.homeworkStudentNum;
             this.homeworkNum = res.data.homeworkNum;
             this.repliedNum = res.data.repliedNum;
           }

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

@@ -110,7 +110,7 @@
 
         <el-table-column align="center"
                          prop="courseScheduleStatus"
-                         label="课程状态">
+                         label="课程状态">s
           <template slot-scope="scope">
             <div>{{ scope.row.courseScheduleStatus | coursesStatus }}</div>
           </template>
@@ -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"
@@ -137,7 +137,11 @@
         <el-table-column align="center"
                          prop="remark"
                          label="是否点名">
-          <template slot-scope="scope">{{ scope.row.isCallNames ? '已点名' : '未点名' }}</template>
+          <template slot-scope="scope">
+            <div v-if="scope.row.courseScheduleStatus != 'NOT_START'">
+              {{ scope.row.isCallNames ? '已点名' : '未点名' }}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column align="center"
                          prop="remark"

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>