02/09 冻结课程无法合并合并课

1

src/views/teamDetail/componentCourse/teacherList.vue

@@ -41,6 +41,34 @@
         </template>
       </el-table-column>
       <el-table-column align='center'
+                       prop="teacherPhone"
+                       label="签到状态">
+        <template slot-scope="scope">
+          <div>{{ 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>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="signOutAttachments"
+                       label="签退照片">
+        <template slot-scope="scope">
+          <el-image
+            v-if="scope.row.teacherAttendance && scope.row.teacherAttendance.signOutAttachments"
+            style="width: 60px; height: 60px"
+            fit="cover"
+            :src="scope.row.teacherAttendance.signOutAttachments"
+            :previewSrcList="[scope.row.teacherAttendance.signOutAttachments]"
+          >
+          </el-image>
+        </template>
+      </el-table-column>
+        <el-table-column align='center'
                        prop="complaintsContent"
                        width="120"
                        label="考勤申诉内容">
@@ -73,34 +101,6 @@
         </template>
       </el-table-column>
       <el-table-column align='center'
-                       prop="teacherPhone"
-                       label="签到状态">
-        <template slot-scope="scope">
-          <div>{{ 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>
-        </template>
-      </el-table-column>
-      <el-table-column align='center'
-                       prop="signOutAttachments"
-                       label="签退照片">
-        <template slot-scope="scope">
-          <el-image
-            v-if="scope.row.teacherAttendance && scope.row.teacherAttendance.signOutAttachments"
-            style="width: 60px; height: 60px"
-            fit="cover"
-            :src="scope.row.teacherAttendance.signOutAttachments"
-            :previewSrcList="[scope.row.teacherAttendance.signOutAttachments]"
-          >
-          </el-image>
-        </template>
-      </el-table-column>
-      <el-table-column align='center'
                        prop="disposeContent"
                        label="处理意见">
         <template slot-scope="scope">

src/views/teamDetail/teamCourseList.vue

@@ -390,7 +390,8 @@
                     !isAddCom(scope.row) &&
                     permission('courseSchedule/courseMerge') &&
                     scope.row.newCourseId <= 0 &&
-                    !scope.row.beMerged
+                    !scope.row.beMerged&&
+                    !scope.row.isLock // 李焕辜临轩要求冻结课程不能合并
                   "
                   >添加合课</el-button
                 >