Merge branch 'ol_12_30' into wxl_01_15

debug.log

@@ -1,20 +0,0 @@
-[1207/094223.177:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1208/093635.101:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1209/094216.333:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1211/093733.478:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1214/094206.298:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1216/112417.508:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1218/093715.178:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1223/094343.219:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1224/093236.399:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1225/094724.194:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1230/094024.562:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[1231/093553.846:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0104/094020.609:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0105/101053.212:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0106/093923.589:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0107/093708.765:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0108/093931.571:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0111/093600.762:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0112/094119.970:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0114/100435.220:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

src/views/resetTeaming/components/resetPayList.vue

@@ -129,7 +129,7 @@
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
               <el-button type="text"
                          @click="openChioseStudent(scope.row)"
-                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT' && scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
+                         v-if="scope.row.auditStatus != 'REJECT' && scope.row.auditStatus != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT' && scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
                          v-if="teamStatus && scope.row.auditStatus === 'REJECT'"

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -129,7 +129,7 @@
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
               <el-button type="text"
                          @click="openChioseStudent(scope.row)"
-                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
+                         v-if="scope.row.auditStatus != 'REJECT' && scope.row.auditStatus != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
                          v-if="teamStatus && scope.row.auditStatus === 'REJECT'"

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -177,7 +177,7 @@
         <div
           class="newBand"
           @click="delStudentBtn"
-          v-if="info.paymentStatus == 'NO' && titleForm.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
+          v-if="titleForm.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
           v-permission="'musicGroupPaymentCalenderDetail/batchDel'"
         >
           删除学员

src/views/teamBuild/components/merged-students.vue

@@ -98,7 +98,10 @@ export default {
         await this.$confirm('是否确认删除已选择学员?', '提示', {
           type: 'warning'
         })
-        await batchDelStudentRegistration(this.passed)
+        await batchDelStudentRegistration({
+          musicGroupId: this.id,
+          userIds: this.passed
+        })
         this.$message.success('删除成功')
         this.FetchDetail()
       } catch (error) {}

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -554,6 +554,7 @@ export default {
         ownershipType: this.topfor.ownershipType,
         repairUserId: this.topfor.repairUserId,
         feeType: this.topfor.feeType,
+        directorUserId:this.topfor.head
       };
       return obj;
     },

src/views/teamDetail/componentCourse/teacherList.vue

@@ -73,20 +73,6 @@
         </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">