Merge branch 'ol_12_30' into online

src/views/resetTeaming/modals/school-pay-user-list.vue

@@ -28,12 +28,12 @@
       <el-form-item>
         <el-button @click="FetchList" type="danger">搜索</el-button>
         <el-button @click="onReSet" type="primary">重置</el-button>
-        <!-- <el-button
+        <el-button
           type="primary"
           :disabled="!activeChiose.length"
           @click="deleteUser"
           v-permission="'musicGroupPaymentCalenderDetail/batchDel'"
-        >删除学员</el-button> -->
+        >删除学员</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -41,7 +41,7 @@
       @selection-change="handleSelectionChange"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
-      <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
+      <el-table-column type="selection" width="55"> </el-table-column>
       <el-table-column
         align="center"
         prop="userId"

src/views/teamDetail/componentCourse/teacherList.vue

@@ -73,6 +73,20 @@
         </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="teacherPhone"
                        label="签到状态">
         <template slot-scope="scope">