Merge branch '02/23reviewBUG' into test

src/views/teamBuild/signupList.vue

@@ -1251,14 +1251,17 @@ export default {
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
     if (isSuperAdmin) {
-      this.isManage = 'super';
+      this.isManage = "super";
     } else {
       if (roles.indexOf(3) != -1) {
-        this.isManage = 'manage';
+        this.isManage = "manage";
       } else {
         this.isManage = false;
       }
     }
+    if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
+      this.isManage = "super";
+    }
     this.init();
   },
   activated() {
@@ -1749,10 +1752,10 @@ export default {
           courseViewType: this.courseViewType,
           studentName: row.studentName,
           musicGroupName: this.teamName,
-          hasMaintenance:row.hasMaintenance
+          hasMaintenance: row.hasMaintenance,
         };
 
-        this.activeRow = {...row,...res.data};
+        this.activeRow = { ...row, ...res.data };
 
         this.activeRow.courseViewType = this.courseViewType;
         this.quitVisible = true;
@@ -1837,9 +1840,9 @@ export default {
                 musicalFee: params.musicalFee,
               };
               if (this.isManage) {
-                params.status = 'APPROVED'
+                params.status = "APPROVED";
               } else {
-                params.status = 'PROCESSING'
+                params.status = "PROCESSING";
               }
               // 发请求 退团
               applyMusicGroupQuit(params).then((res) => {

src/views/teamDetail/components/studentList.vue

@@ -1180,7 +1180,7 @@ export default {
       organId: "",
       addTryVisible: false,
       memberRankList: [],
-      isManage:false
+      isManage: false,
     };
   },
   components: {
@@ -1211,17 +1211,20 @@ export default {
   //   this.init();
   // },
   async mounted() {
-      let isSuperAdmin = this.$store.getters.isSuperAdmin;
+    let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
     if (isSuperAdmin) {
-      this.isManage = 'super';
+      this.isManage = "super";
     } else {
       if (roles.indexOf(3) != -1) {
-        this.isManage = 'manage';
+        this.isManage = "manage";
       } else {
         this.isManage = false;
       }
     }
+    if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
+      this.isManage = "super";
+    }
     try {
       const res = await getOrganizationCourseUnitPriceSettings({
         rows: 9999,
@@ -1736,7 +1739,7 @@ export default {
           musicGroupName: this.baseInfo.name,
           hasMaintenance: row.hasMaintenance,
         };
-        this.activeRow = {...row,...res.data};
+        this.activeRow = { ...row, ...res.data };
         this.quitVisible = true;
         // this.quitForm.cloudTeacherAmount = row.cloudTeacherAmount;
       } catch (e) {

src/views/withdrawal-application/index.vue

@@ -331,6 +331,9 @@ export default {
         this.isManage = false;
       }
     }
+    if(roles.indexOf(3) != -1&&roles.indexOf(4) != -1){
+       this.isManage = "super";
+    }
     this.FetchList();
   },
   methods: {

src/views/workBenchManager/journal/model/musicGroup.vue

@@ -151,7 +151,15 @@
         ></el-input>
       </el-form-item> -->
     <!-- </el-form> -->
-    <quiteTeam :quitForm="quitForm" ref="musicForm"  :isDisabled="musicForm.status!= 'PROCESSING'|| (isManage == 'manage' && musicForm.currentApproveRole == '4')|| (!isManage&&musicForm.currentApproveRole == '3')"/>
+    <quiteTeam
+      :quitForm="quitForm"
+      ref="musicForm"
+      :isDisabled="
+        musicForm.status != 'PROCESSING' ||
+        (isManage == 'manage' && musicForm.currentApproveRole == '4') ||
+        (!isManage && musicForm.currentApproveRole == '3')
+      "
+    />
     <span
       slot="footer"
       class="dialog-footer question"
@@ -181,7 +189,7 @@
           type="primary"
           v-permission="'musicGroupQuit/quitMusicGroup/conform'"
           v-if="!isManage"
-          :disabled='musicForm.currentApproveRole == "3"'
+          :disabled="musicForm.currentApproveRole == '3'"
           @click="onSubmitGroup(musicForm, 'PROCESSING')"
           >提交审核</el-button
         >
@@ -197,7 +205,8 @@
         >
         <el-button
           :disabled="
-            (isManage == 'manage' && musicForm.currentApproveRole == '4')|| (!isManage&&musicForm.currentApproveRole == '3')
+            (isManage == 'manage' && musicForm.currentApproveRole == '4') ||
+            (!isManage && musicForm.currentApproveRole == '3')
           "
           type="danger"
           v-permission="'musicGroupQuit/quitMusicGroup'"
@@ -338,6 +347,9 @@ export default {
           this.isManage = false;
         }
       }
+      if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
+        this.isManage = "super";
+      }
       //   isSuperAdmin:state=>state.user.isSuperAdmin,
       // roles:state=>state.user.roles,
 
@@ -370,7 +382,7 @@ export default {
             }
             this.activeRow = { ...res.data.returnFeeDto };
             this.quitForm.courseViewType = res.data.musicGroup.courseViewType;
-              this.quitForm.reason = res.data.reason
+            this.quitForm.reason = res.data.reason;
             this.quitForm.userComment = res.data.userComment;
             this.quitForm.isVisit = res.data.isVisit;
             this.quitForm.visitTime = res.data.visitTime;