Merge branch 'ol_12_30' into test

src/views/teamBuild/forecastName.vue

@@ -9,7 +9,7 @@
         </p> -->
 
     <div class="btnList">
-      <auth :auths="['musicGroup/sendParentMeetingNotice']" v-if="isedit">
+      <auth :auths="['musicGroup/sendParentMeetingNotice']" v-if="isedit || $route.query.team_status=='PRE_BUILD_FEE'">
         <el-button type="primary" @click="extendPaymentStatus = true"
           >预报名家长会通知</el-button
         >

src/views/withdrawal-application/index.vue

@@ -311,6 +311,7 @@ import { musicGroupQuitQeryPage, batchQuitMusicGroup } from "./api";
 import cleanDeep from "clean-deep";
 import { musicGroupQuit } from "@/api/journal";
 import { withdrawalStatus } from "@/constant";
+let that;
 const initSearch = {
   search: "",
   status: null,
@@ -355,6 +356,7 @@ export default {
     };
   },
   async mounted() {
+    that = this;
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
     await this.$store.dispatch("setBranchs");
@@ -524,8 +526,8 @@ export default {
             try {
               const res = await batchQuitMusicGroup(objList);
               this.$message.success("审批成功");
-              this.getList()
               done();
+              this.FetchList();
             } catch (e) {
               console.log(e);
             }
@@ -541,8 +543,8 @@ export default {
             try {
               const res = await batchQuitMusicGroup(objList);
               this.$message.success("审批成功");
-              this.getList()
               done();
+              this.FetchList();
             } catch (e) {
               console.log(e);
             }
@@ -560,7 +562,7 @@ export default {
         });
     },
     checkSeleabled(row) {
-      if (row.status == "PROCESSING"&&row.currentApproveRole=='3') {
+      if (row.status == "PROCESSING" && row.currentApproveRole == "3") {
         return 1;
       } else {
         return 0;