Merge branch '03/12permission' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 03/12permission

src/views/resetTeaming/modals/user-pay-form.vue

@@ -293,7 +293,7 @@ export default {
       }
     },
     async "form.musicGroupOrganizationCourseSettingId" (val) {
-      if (val) {
+      if (val&&!this.rowDetail) {
         try {
           const res = await queryByMusicGroupOrganizationCourseSettingsId({
             id: val

src/views/teamDetail/components/studentList.vue

@@ -307,7 +307,7 @@
           filterable
           placeholder="报名缴费"
         >
-          <el-option label="未开启" value="0"></el-option>
+          <el-option label="未开启缴费" value="0"></el-option>
           <el-option label="开启缴费" value="1"></el-option>
           <el-option label="已缴费" value="2"></el-option>
         </el-select>
@@ -2315,7 +2315,7 @@ export default {
       }
       let ids = [];
       selection.forEach((item) => {
-        ids.push(item.id);
+        ids.push(item.studentRegistrationId);
       });
 
       this.$confirm(`是否确认开启缴费?`, "提示", {