Merge branch '02/23reviewBUG' into test

src/views/teamDetail/components/studentList.vue

@@ -1533,7 +1533,7 @@ export default {
                     reason: "",
                     userComment: null,
                   };
-                  this.$message.success("退团成功");
+                  this.$message.success("退团申请成功");
                   this.getList();
                   this.quitVisible = false;
                 }

src/views/withdrawal-application/index.vue

@@ -39,6 +39,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
+          <el-select
+            v-model="searchForm.currentApproveRole"
+            clearable
+            placeholder="请选择角色"
+          >
+            <el-option label="分部经理" value="3"></el-option>
+            <el-option label="乐团主管" value="4"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
           <el-button
@@ -96,10 +106,13 @@
         <el-table-column label="状态">
           <template slot-scope="scope">
             <div>
-                {{ scope.row.status | withdrawalStatus }}
-                <span v-if="scope.row.status=='PROCESSING'">({{scope.row.currentApproveRole==3?'分部经理':'乐团主管'}})</span>
+              {{ scope.row.status | withdrawalStatus }}
+              <span v-if="scope.row.status == 'PROCESSING'"
+                >({{
+                  scope.row.currentApproveRole == 3 ? "分部经理" : "乐团主管"
+                }})</span
+              >
             </div>
-
           </template>
         </el-table-column>
         <el-table-column
@@ -123,8 +136,9 @@
                   scope.row.status == 'DENIED' ||
                   scope.row.status == 'CANCELED' ||
                   (scope.row.status == 'PROCESSING' &&
-                    isManage=='manage' &&
-                    scope.row.currentApproveRole == '4')||(scope.row.status == 'PROCESSING' &&
+                    isManage == 'manage' &&
+                    scope.row.currentApproveRole == '4') ||
+                  (scope.row.status == 'PROCESSING' &&
                     !isManage &&
                     scope.row.currentApproveRole == '3')
                 "
@@ -134,14 +148,19 @@
               <el-button
                 type="text"
                 v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
-                :disabled="!( scope.row.status != 'PROCESSING' ||
-                  scope.row.status == 'DENIED' ||
-                  scope.row.status == 'CANCELED' ||
-                  (scope.row.status == 'PROCESSING' &&
-                    isManage=='manage' &&
-                    scope.row.currentApproveRole == '4')||(scope.row.status == 'PROCESSING' &&
-                    !isManage &&
-                    scope.row.currentApproveRole == '3'))"
+                :disabled="
+                  !(
+                    scope.row.status != 'PROCESSING' ||
+                    scope.row.status == 'DENIED' ||
+                    scope.row.status == 'CANCELED' ||
+                    (scope.row.status == 'PROCESSING' &&
+                      isManage == 'manage' &&
+                      scope.row.currentApproveRole == '4') ||
+                    (scope.row.status == 'PROCESSING' &&
+                      !isManage &&
+                      scope.row.currentApproveRole == '3')
+                  )
+                "
                 @click="quieTeamMask(scope.row, 'look')"
                 >查看</el-button
               >
@@ -302,12 +321,12 @@ export default {
   mounted() {
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
-    console.log(roles)
+    console.log(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;
       }