Browse Source

提交测试

1.学员列表乐团名称显示不全
mo 3 năm trước cách đây
mục cha
commit
c692e5f0ea

+ 1 - 1
src/views/2021memeberActionManager/memberActiveDetail.vue

@@ -210,7 +210,7 @@ export default {
   async mounted() {
     this.organId = this.$route.query.organId;
     try{
-     const res = await getGradeList({organId:this.organId})
+     const res = await getGradeList({id:this.organId})
      this.gradeList = res.data
     }catch(e){
       console.log(e)

+ 1 - 0
src/views/buildVip/index.vue

@@ -2007,5 +2007,6 @@ export default {
   margin-bottom: 20px;
   font-size: 14px;
   padding-left: 24px;
+
 }
 </style>

+ 6 - 3
src/views/studentManager/components/teamAndcourse.vue

@@ -23,9 +23,12 @@
                          prop="musicGroupName"
                          label="乐团名称">
                          <template slot-scope="scope">
-                           <el-button type="text"  @click="gotoMusic(scope.row.musicGroupName)">
-                              {{ scope.row.musicGroupName }}
-                           </el-button>
+                           <div  @click="gotoMusic(scope.row.musicGroupName)" style="color: #14928A;  cursor: pointer;">
+                             {{ scope.row.musicGroupName }}
+                           </div>
+                           <!-- <el-button type="text" >
+                               <copy-text></copy-text>
+                           </el-button> -->
                          </template>
         </el-table-column>
         <el-table-column align="center"

+ 20 - 1
src/views/teamBuild/signupList.vue

@@ -1808,7 +1808,26 @@ export default {
                   reason: "",
                 };
                 if (res.code == 200) {
-                  this.$message.success("退团成功");
+                  this.quitForm = {
+                    // 退团信息确认
+                    isRefundCourseFee: null,
+                    isRefundInstrumentFee: null,
+                    isRefundTeachingAssistantsFee: null,
+                    reason: "",
+                    courseViewType: null,
+                    hasMaintenance: null,
+                    studentName: null,
+                    musicGroupName: null,
+                    isVisit: false,
+                    reason: "",
+                    userComment: null,
+                  };
+                  if(this.isManage == "super") {
+                     this.$message.success("退团成功");
+                  }else{
+                     this.$message.success("退团申请成功");
+                  }
+
                   this.getList();
                   this.quitVisible = false;
                 }

+ 26 - 5
src/views/teamDetail/components/studentList.vue

@@ -331,8 +331,11 @@
         <!-- 年纪班级修改 -->
         <el-table-column align="center" label="年级班级">
           <template slot-scope="scope">
-
-            <div v-if="gradeListObj[scope.row.currentGrade]">{{ gradeListObj[scope.row.currentGrade] + scope.row.currentClass }}</div>
+            <div v-if="gradeListObj[scope.row.currentGrade]">
+              {{
+                gradeListObj[scope.row.currentGrade] + scope.row.currentClass
+              }}
+            </div>
           </template>
         </el-table-column>
         <!-- <el-table-column align="center" label="报名专业" prop="subjectName">
@@ -1178,7 +1181,8 @@ export default {
       organId: "",
       addTryVisible: false,
       memberRankList: [],
-      gradeListObj:{}
+      isManage: false,
+      gradeListObj: {},
     };
   },
   components: {
@@ -1248,7 +1252,7 @@ export default {
       // }
       getMusicGroupGradeList({ musicGroupId: this.teamid }).then((res) => {
         let result = res.data;
-        this.gradeListObj = res.data
+        this.gradeListObj = res.data;
         if (res.code == 200 && result) {
           for (let i in result) {
             this.gradeList.push({
@@ -1506,7 +1510,24 @@ export default {
                   reason: "",
                 };
                 if (res.code == 200) {
-                  this.$message.success("退团成功");
+                  this.quitForm = {
+                    // 退团信息确认
+                    isRefundCourseFee: null,
+                    isRefundInstrumentFee: null,
+                    isRefundTeachingAssistantsFee: null,
+                    courseViewType: null,
+                    hasMaintenance: null,
+                    studentName: null,
+                    musicGroupName: null,
+                    isVisit: false,
+                    reason: "",
+                    userComment: null,
+                  };
+                  if (this.isManage == "super") {
+                    this.$message.success("退团成功");
+                  } else {
+                    this.$message.success("退团申请成功");
+                  }
                   this.getList();
                   this.quitVisible = false;
                 }